changed:
#buttonPress:x:y:in:
#extractSelectorAndSelectedTextFrom:
#implementorsMenu
#sendersMenu
--- a/Tools__CodeView2.st Sat Mar 03 11:49:38 2012 +0100
+++ b/Tools__CodeView2.st Mon Mar 05 11:03:15 2012 +0100
@@ -1051,12 +1051,12 @@
!
extractSelectorAndSelectedTextFrom: givenSelectedText
-
| selector selectedText compilerClass na |
+
selectedText := givenSelectedText.
compilerClass := self language compilerClass.
selectedText size > 0 ifTrue:[
- self windowGroup withWaitCursorDo:[
+ "/ self windowGroup withWaitCursorDo:[
"/ hack, for now and expecco; must ask the Parser eventually...
(compilerClass notNil and:[compilerClass includesBehavior:JavaScriptParser]) ifTrue:[
"/ selector is in one piece anyway
@@ -1072,11 +1072,12 @@
] ifFalse:[
selector := SystemBrowser extractSelectorFrom:selectedText.
].
- ]
+ "/ ]
].
^Array with: selector with: selectedText
"Created: / 30-06-2011 / 19:49:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 05-03-2012 / 09:04:12 / cg"
!
implementorsOf: selector
@@ -1188,16 +1189,14 @@
^ services
inject: false
- into:
- [:processed :service|
+ into:[:processed :service|
service isEnabled
- ifFalse:
- [processed]
- ifTrue:
- [processed | ((service buttonPress: button x:x y:y in: view) == true)]].
+ ifFalse: [processed]
+ ifTrue: [processed | ((service buttonPress: button x:x y:y in: view) == true)]].
"Modified: / 07-03-2010 / 13:53:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 06-10-2011 / 14:14:00 / cg"
+ "Modified (format): / 05-03-2012 / 08:56:02 / cg"
!
keyPress: key x:x y:y in: view
@@ -1549,24 +1548,24 @@
selectedText := textView selectionAsString.
selectedText size > 0 ifTrue:[
- self windowGroup withWaitCursorDo:[
+ "/ self windowGroup withWaitCursorDo:[
selectorAndSelectedText := self extractSelectorAndSelectedTextFrom: selectedText.
selector := selectorAndSelectedText first.
selectedText := selectorAndSelectedText second.
(selector notNil and:[selector = selectedText]) ifTrue:[
implementors := (SystemBrowser
- findImplementorsOfAny:(Array with:selectedText)
- in:(Smalltalk allClasses)
- ignoreCase:false)
-
- ] ifFalse:[
+ findImplementorsOf:selectedText "Any: (Array with:selectedText)"
+ in:(Smalltalk allClasses)
+ ignoreCase:false)
+
+ ] ifFalse:[
implementors := (SystemBrowser
- findImplementorsOfAny:(Array with:selectedText with: selector)
- in:(Smalltalk allClasses)
- ignoreCase:false)
- ].
- ]
+ findImplementorsOfAny:(Array with:selectedText with: selector)
+ in:(Smalltalk allClasses)
+ ignoreCase:false)
+ ].
+ "/ ]
] ifFalse:[
implementors := #().
].
@@ -1575,6 +1574,7 @@
"Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 05-03-2012 / 09:02:43 / cg"
!
implementorsMenu: implementors selector: selector
@@ -1611,24 +1611,24 @@
selectedText := textView selectionAsString.
selectedText size > 0 ifTrue:[
- self windowGroup withWaitCursorDo:[
+ "/ self windowGroup withWaitCursorDo:[
selectorAndSelectedText := self extractSelectorAndSelectedTextFrom: selectedText.
selector := selectorAndSelectedText first.
selectedText := selectorAndSelectedText second.
(selector notNil and:[selector = selectedText]) ifTrue:[
senders := (SystemBrowser
- findSendersOfAny:(Array with:selectedText)
+ findSendersOf:selectedText "Any:(Array with:selectedText)"
in:(Smalltalk allClasses)
ignoreCase:false)
- ] ifFalse:[
+ ] ifFalse:[
senders := (SystemBrowser
findSendersOfAny:(Array with:selectedText with: selector)
in:(Smalltalk allClasses)
ignoreCase:false)
- ].
- ]
+ ].
+ "/ ]
] ifFalse:[
senders := #().
].
@@ -1637,6 +1637,7 @@
"Modified: / 19-10-2008 / 08:16:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Created: / 30-06-2011 / 19:28:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 05-03-2012 / 09:02:56 / cg"
!
sendersMenu: senders selector: selector
@@ -3265,11 +3266,11 @@
!CodeView2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.51 2012-03-02 18:57:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.52 2012-03-05 10:03:15 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.51 2012-03-02 18:57:21 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.52 2012-03-05 10:03:15 cg Exp $'
!
version_SVN