hg/stx-libtool: comparison Tools__CodeNavigationService.st

equal deleted inserted replaced

-:d59bc761de55
+:7639ba8f13da
 "{ NameSpace: Tools }"
 CodeViewService subclass:#CodeNavigationService
 	instanceVariableNames:'selectorEmphasis variableEmphasis currentEmphasis linesToRedraw'
-	classVariableNames:''
+	classVariableNames:'DefaultVariableEmphasis DefaultSelectorEmphasis'
 	poolDictionaries:''
 	category:'Interface-CodeView'
 !
 !CodeNavigationService class methodsFor:'documentation'!
 ! !
 !CodeNavigationService class methodsFor:'accessing - defaults'!
 defaultSelectorEmphasis
-^ Array with:#backgroundColor
+DefaultSelectorEmphasis isNil ifTrue:[
--> (Color white blendWith:(Color
+DefaultSelectorEmphasis :=
-redByte:100
+Array with:(#backgroundColor -> (Color rgbValue:16rDBEEFF))
-greenByte:180
+].
-blueByte:255))
+^ DefaultSelectorEmphasis
+"Modified: / 21-08-2011 / 09:58:18 / cg"
 !
 defaultVariableEmphasis
-^ Array with:#backgroundColor
+DefaultVariableEmphasis isNil ifTrue:[
--> (Color gray: 90)
+DefaultVariableEmphasis := Array with:(#backgroundColor -> (Color gray: 90))
+].
+^ DefaultVariableEmphasis
 "Created: / 25-06-2010 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 11:04:20 / cg"
 ! !
 !CodeNavigationService methodsFor:'code services'!
-browseClass: class
+browseClass:class
+self browser isNil ifTrue:[ ^ NewSystemBrowser browseClass:class ].
-self browser ifNil: [^NewSystemBrowser browseClass:class].
 (UserPreferences current alwaysOpenNewTabWhenCtrlClick
-or:[self browser navigationState modified])
+or:[ self browser navigationState modified ])
-ifTrue:
+ifTrue:[
-[self browser
+self browser
-spawnFullBrowserInClass: class selector:nil in:#newBuffer]
+spawnFullBrowserInClass:class
-ifFalse:
+selector:nil
-[self browser
+in:#newBuffer
-switchToClass: class]
+]
+ifFalse:[ self browser switchToClass:class ]
 "Created: / 15-02-2010 / 09:36:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 25-07-2010 / 11:00:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:07:30 / cg"
 !
 browser
 ^codeView browserHolder value
 button1PressForSelector: selector
 | impls menu |
 impls := codeView implementorsOf: selector.
-impls size = 1 ifTrue:[^codeView browseMethod: impls anyOne].
+"/ impls size = 1 ifTrue:[^codeView browseMethod: impls anyOne].
 menu := codeView implementorsMenu: impls selector: selector.
 self highlightClear.
 menu showAtPointer.
 "Created: / 14-02-2010 / 18:50:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 30-06-2011 / 19:34:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 07-07-2011 / 17:16:23 / jv"
+"Modified: / 21-08-2011 / 11:06:08 / cg"
 !
 button2Press
 | sel |
 !
 button2PressForSelector: selector
 | senders menu |
-senders := codeView implementorsOf: selector.
+senders := codeView sendersOf: selector.
-senders size = 1 ifTrue:[^self browseMethod: senders anyOne].
+"/ senders size = 1 ifTrue:[ codeView browseMethod: senders anyOne. ^ self].
 menu := codeView sendersMenu: senders selector: selector.
 self highlightClear.
 menu showAtPointer.
 "Created: / 14-02-2010 / 18:50:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 30-06-2011 / 19:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
+"Modified: / 21-08-2011 / 11:34:49 / cg"
+!
-buttonMotion: button x:x y:y in: view
+buttonMotion:button x:x y:y in:view
 "Handles an event in given view (a subview of codeView).
 If the method returns true, the event will not be processed
 by the view."
-(view == textView and:[textView sensor ctrlDown]) ifTrue:
+(view == textView and:[ textView sensor ctrlDown ]) ifTrue:[
-[self highlightElementAtX:x y:y. ^true].
+self highlightElementAtX:x y:y.
-^false
+^ true
+].
+^ false
 "Created: / 06-03-2010 / 20:40:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified (format): / 21-08-2011 / 10:07:15 / cg"
 !
 buttonPress: button x:x y:y in: view
 "Handles an event in given view (a subview of codeView).
 If the method returns true, the event will not be processed
 by the view."
-(view == textView) ifTrue:
+(view == textView) ifTrue:[
-[codeView sensor ctrlDown ifTrue:
+codeView sensor ctrlDown ifTrue:[
-[button == 1      ifTrue: [self button1Press.^true].
+button == 1      ifTrue: [self button1Press.^true].
 button == #paste ifTrue: [self button2Press.^true].
-button == 2      ifTrue: [self button2Press.^true]].
+button == 2      ifTrue: [self button2Press.^true]
+].
 button == 1 ifTrue:[
 self highlightVariableAtX:x y:y.
 ]
 ].
 ^false
 "Created: / 06-03-2010 / 21:12:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 25-06-2010 / 14:53:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified (format): / 21-08-2011 / 10:06:54 / cg"
 !
 keyPress:key x:x y:y in:view
 "Handles an event in given view (a subview of codeView).
 If the method returns true, it has eaten the event and it will not be processed
 by the view."
+|ev p|
 (view == textView) ifTrue:[
 (key == #'Control_L' or:[ key == #Ctrl ]) ifTrue:[
-view sensor pushUserEvent:#highlightElementAtX:y: for:self withArguments:{x. y.}.
+"/ because it is delegated, the position is not correct
+ev := WindowGroup lastEventQuerySignal query.
+p := view device translatePoint:(ev x @ ev y) fromView:ev view toView:view.
+view sensor pushUserEvent:#highlightElementAtX:y: for:self withArguments:{p x. p y.}.
 ^ true.
 ].
 view sensor pushUserEvent:#highlightVariableAtCursor for:self .
 ].
 ^ false
 "Created: / 06-03-2010 / 20:50:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 20-07-2011 / 18:49:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 18-08-2011 / 16:01:07 / cg"
+"Modified: / 21-08-2011 / 11:33:16 / cg"
 !
 keyRelease: key x:x y:y in: view
 "Handles an event in given view (a subview of codeView).
 If the method returns true, it has eaten the event and it will not be processed
 by the view."
+|ev p|
 (view == textView and:[key == #'Control_L' or:[key == #Ctrl]]) ifTrue:[
-view sensor pushUserEvent:#highlightClear for:self.
+"/ because it is delegated, the position is not correct
+ev := WindowGroup lastEventQuerySignal query.
+p := view device translatePoint:(ev x @ ev y) fromView:ev view toView:view.
+self highlightClear.
+"/        view sensor pushUserEvent:#highlightClear for:self.
 ^ true
 ].
 ^ false
 "Created: / 06-03-2010 / 21:03:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified (comment): / 18-08-2011 / 15:57:49 / cg"
+"Modified: / 21-08-2011 / 11:32:40 / cg"
 ! !
 !CodeNavigationService methodsFor:'initialization'!
 initialize
 ^self elementAtLine: textView cursorLine col: textView cursorCol - 1
 "Created: / 25-06-2010 / 14:39:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
-elementAtLine:line col:col
+elementAtLine:line col:colArg
-|characterPosition index element |
+|characterPosition index element col|
+"/ if beyond end of line, do not advance into next line
+col := colArg min:(textView listAt:line) size.
 characterPosition := textView characterPositionOfLine:line col:col.
 index := SortedCollection binarySearch: (codeView syntaxElements) forIndexOf: characterPosition.
 index > (codeView syntaxElements) size ifTrue:[^nil].
-element := (codeView syntaxElements) at: index.
+element := (codeView syntaxElements) at:index ifAbsent:nil.
-(characterPosition between: element start and: element stop) ifFalse:[^nil].
+element notNil ifTrue:[
-^element
+(characterPosition between: element start and: element stop) ifTrue:[^element].
+].
+^nil
 "Created: / 25-06-2010 / 14:40:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 11:03:29 / cg"
 !
 elementAtX:x y:y
 |visibleLine line col|
-codeView syntaxElements ifNil:[^nil].
+codeView syntaxElements isNil ifTrue:[^nil].
 visibleLine := textView visibleLineOfY:y.
 col := textView colOfX:x inVisibleLine:visibleLine.
 line := textView visibleLineToAbsoluteLine:visibleLine.
 ^self elementAtLine:line col:col
 "Created: / 25-06-2010 / 14:52:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 01-08-2010 / 08:50:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:26:08 / cg"
+!
+foo
+|characterPosition index element |
+characterPosition := 1
+"Created: / 21-08-2011 / 10:48:05 / cg"
 !
 highlighEmphasisFor: element
 element ifNil:[^nil].
-element type == #selector ifTrue:[^selectorEmphasis].
+element isSelector ifTrue:[^selectorEmphasis].
-element type == #variable ifTrue:[^variableEmphasis].
+element isVariable ifTrue:[^variableEmphasis].
+element isSelf     ifTrue:[^variableEmphasis].
 ^nil
 "Created: / 25-06-2010 / 13:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 09:42:37 / cg"
 !
 highlightClear
 ^self highlightClear: true.
 "Modified: / 08-07-2011 / 08:50:45 / cg"
 "Modified: / 20-07-2011 / 18:52:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 highlightClear: redraw
 codeView syntaxElementSelection == nil ifTrue:[ ^ self ].
 textView list ifNil:[ ^ self ].
 textView list withIndexDo:[:line :lineNo |
 line isText ifTrue:[
 codeView syntaxElementSelection:nil.
 redraw ifTrue:[self redrawLines].
 "Modified: / 26-12-2007 / 12:28:05 / janfrog"
-"Modified: / 08-07-2011 / 08:50:45 / cg"
 "Created: / 20-07-2011 / 18:52:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:15:15 / cg"
 !
 highlightElement:element
-codeView syntaxElementSelection == element ifTrue:[ ^ self ].
+|e|
-self highlightClear: false.
+codeView syntaxElementSelection == element ifTrue:[ ^ self ]. "/ no change
+codeView syntaxElementSelection notNil ifTrue:[
+self highlightClear: false.
+].
 currentEmphasis := self highlighEmphasisFor:element.
-element ifNotNil:
+element notNil ifTrue:[
-[ |e|
+codeView syntaxElementSelection:element.
+e := element firstElementInChain.
-codeView syntaxElementSelection:element.
+[ e notNil ] whileTrue:[
-e := element.
+self highlightWithoutClearFrom:e start to:e stop.
-[ e isNil ] whileFalse:
+e := e nextElement
-[ self highlightWithoutClearFrom:e start to:e stop.
+].
-e := e next ].
+].
-e := element prev.
-[ e isNil ] whileFalse:
-[ self highlightWithoutClearFrom:e start to:e stop.
-e := e prev ] ].
 self redrawLines.
 "Created: / 14-02-2010 / 16:18:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-"Modified: / 30-06-2011 / 11:06:42 / cg"
 "Modified: / 20-07-2011 / 18:52:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:22:58 / cg"
 !
 highlightElementAtCursor
 self highlightElementAtLine: textView cursorLine col: textView cursorCol
 !
 highlightElementAtX:x y:y
 |visibleLine line col|
-codeView syntaxElements ifNil:[^self].
+codeView syntaxElements isNil ifTrue:[^self].
 visibleLine := textView visibleLineOfY:y.
 col := textView colOfX:x inVisibleLine:visibleLine.
 line := textView visibleLineToAbsoluteLine:visibleLine.
 self highlightElementAtLine:line col:col
 "Created: / 14-02-2010 / 16:12:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-03-2010 / 20:06:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:22:10 / cg"
+!
+highlightElementOrNil:e
+e notNil ifTrue:[
+"/ cg: only if selected !!
+"/ self halt.
+self highlightElement:e.
+] ifFalse:[
+self highlightClear
+].
+"Created: / 25-06-2010 / 14:52:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Created: / 21-08-2011 / 09:56:39 / cg"
 !
 highlightLine:lineNo fromLine:startLine col:endLine toLine:startCol col:endCol
 |line start end|
 "Modified: / 08-07-2011 / 13:02:51 / cg"
 "Modified: / 20-07-2011 / 18:43:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 highlightVariable:e
-(e notNil and:[ e type == #variable ]) ifTrue:[
+(e notNil and:[ e isVariableOrSelf ]) ifTrue:[
 self highlightElement:e.
 ] ifFalse:[
 self highlightClear.
 ].
 "Modified: / 20-07-2011 / 18:54:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 09:39:42 / cg"
 !
 highlightVariableAtCursor
-|e|
+self highlightElementOrNil:(self elementAtCursor)
-e := self elementAtCursor.
-self highlightVariable: e
 "Modified: / 25-06-2010 / 14:53:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 09:56:56 / cg"
 !
 highlightVariableAtX:x y:y
-|e|
+self highlightElementOrNil:(self elementAtX:x y:y).
-e := self elementAtX:x y:y.
-self highlightVariable:e.
 "Created: / 25-06-2010 / 14:52:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 21-08-2011 / 10:24:50 / cg"
 !
 highlightWithoutClearFrom: start to: end
 "Remove underlined emphasis"
 ! !
 !CodeNavigationService class methodsFor:'documentation'!
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.9 2011-08-18 14:01:56 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.10 2011-08-21 10:23:54 cg Exp $'
 !
 version_SVN
 ^ '�Id: Tools__CodeNavigationService.st 7788 2011-06-17 07:57:48Z vranyj1 �'
 ! !

changeset 10631	7639ba8f13da
parent 10588	6b026f496040
child 10651	7ab02ade36e2