No highlighting by default (either method or language must be set)
authorvrany
Wed, 07 Dec 2011 16:41:14 +0100
changeset 10968 5e738ee1cd2a
parent 10967 8c142eff5641
child 10969 665814cad40d
No highlighting by default (either method or language must be set)
Tools__CodeHighlightingService.st
--- a/Tools__CodeHighlightingService.st	Wed Dec 07 16:40:54 2011 +0100
+++ b/Tools__CodeHighlightingService.st	Wed Dec 07 16:41:14 2011 +0100
@@ -144,35 +144,20 @@
 !CodeHighlightingService methodsFor:'change & update'!
 
 update: aspect with: param from: sender
-    |thisIsACodeChange|
-
-    "JV@2011-12-04: I don't really see the point why the code was changed
-    (see differences between 1.25 and 1.26). However, the change did not
-    preserve the semantics, as the #codeChanged: is sent only iff
-    languageHolder or classHolder change (in r1.26). This is not enough.
-    Consequently, Ctrl-click navigation no longer worked."
-
-    thisIsACodeChange := false.
-
     textView notNil ifTrue:[
         "/sender == textView modifiedChannel ifTrue:[^self codeChanged: false].
-        thisIsACodeChange := (sender == textView model)
-                             or:[ (sender == textView and:[aspect == #sizeOfContents]) ].
+        sender == textView model ifTrue:[^self codeChanged: true].
+        (sender == textView and:[aspect == #sizeOfContents]) ifTrue:[^self codeChanged: true].
     ].
     codeView notNil ifTrue:[
-        "JV@2011-12-04:            v------------ therefore this change"
-        thisIsACodeChange := thisIsACodeChange or: [(sender == codeView languageHolder)
-                             or:[ sender == codeView classHolder ]]
-    ].
-    thisIsACodeChange ifTrue:[
-        self codeChanged: true. 
-        ^ self
+        sender == codeView languageHolder ifTrue:[^self codeChanged: true].
+        sender == codeView classHolder ifTrue:[^self codeChanged: true].
     ].
     super update: aspect with: param from: sender
 
     "Created: / 06-03-2010 / 19:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 03-12-2011 / 10:31:37 / cg"
-    "Modified (format): / 04-12-2011 / 22:44:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-09-2011 / 12:00:29 / cg"
+    "Modified: / 16-09-2011 / 17:30:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeHighlightingService methodsFor:'event handling'!
@@ -311,20 +296,14 @@
 !
 
 syntaxHighlight
+
     |highlighters prio |
 
     (highlighters := self syntaxHighlighters) isEmptyOrNil ifTrue:[
         "No higlighter, nothing to do"
-        ^ self
+        ^self
     ].
 
-    codeView languageHolder value isNil ifTrue:[
-        ^ self
-    ].
-"/    codeView classHolder value isNil ifTrue:[
-"/        ^ self
-"/    ].
-
     "/ this clobbers the codeViews modified state; therefore, we have to remember
     "/ this info somewhere ...
     codeView browser ifNotNil:[
@@ -351,7 +330,7 @@
 
     "Modified: / 07-07-2011 / 12:26:12 / Jan Vrany <jan.vrant@fit.cvut,cz>"
     "Created: / 29-07-2011 / 11:07:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 03-12-2011 / 10:34:01 / cg"
+    "Modified: / 26-09-2011 / 15:40:23 / cg"
 !
 
 syntaxHighlight: delayed
@@ -456,11 +435,11 @@
 !CodeHighlightingService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.27 2011-12-04 21:46:25 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.28 2011-12-07 15:41:14 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.27 2011-12-04 21:46:25 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.28 2011-12-07 15:41:14 vrany Exp $'
 !
 
 version_SVN