hg/stx-libtool: comparison Tools__CodeHighlightingService.st

equal deleted inserted replaced

-:82b4939aafc5
+:6813188d742b
 ! !
 !CodeHighlightingService methodsFor:'accessing'!
 syntaxHighlighter
-| app lang highlighter mthd class |
+| app lang highlighter |
 "First, ask application..."
 app := codeView application.
-mthd := codeView methodHolder value.
-class := codeView classHolder value.
 app notNil ifTrue:[
+| mthd class |
+mthd := codeView methodHolder value.
+class := codeView classHolder value.
 (mthd notNil and:[app respondsTo: #syntaxHighlighterForMethod:]) ifTrue:[
 highlighter := app syntaxHighlighterForMethod:mthd.
 ] ifFalse:[
 (class notNil and:[app respondsTo: #syntaxHighlighterForClass:]) ifTrue:[
 highlighter := app syntaxHighlighterForClass: class.
+] ifFalse:[
+(class notNil and:[app respondsTo: #syntaxHighlighter]) ifTrue:[
+highlighter := app syntaxHighlighterClass.
+].
 ].
 ]
 ].
 "App did not provide any highlighter..."
 highlighter isNil ifTrue:[
 highlighter == SyntaxHighlighter ifTrue:[
 highlighter := SyntaxHighlighter2
 ].
 ^ highlighter
-"Modified: / 05-07-2011 / 11:10:11 / cg"
 "Created: / 05-08-2011 / 10:48:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 26-09-2011 / 15:50:10 / cg"
 !
 syntaxHighlighters
 | highlighters |
 !CodeHighlightingService methodsFor:'initialization'!
 initialize
 job := (Smalltalk at:#BackgroundJob)
-	    named: 'Syntax Highlighting Job'
+named: 'Syntax Highlighting Job'
-	    on:[self syntaxHighlight: true].
+on:[self syntaxHighlight: true].
 "Created: / 29-07-2011 / 10:31:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 03-08-2011 / 16:47:53 / cg"
+"Modified (format): / 26-09-2011 / 15:39:56 / cg"
 ! !
 !CodeHighlightingService methodsFor:'private'!
 codeChanged: force
 syntaxHighlight
 |highlighters prio |
-highlighters := self syntaxHighlighters.
+(highlighters := self syntaxHighlighters) isEmptyOrNil ifTrue:[
-highlighters isEmptyOrNil ifTrue:[
 "No higlighter, nothing to do"
 ^self
 ].
 "/ this clobbers the codeViews modified state; therefore, we have to remember
 job startWithPriority: prio.
 "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: / 22-08-2011 / 14:17:43 / cg"
+"Modified: / 26-09-2011 / 15:40:23 / cg"
 !
 syntaxHighlight: delayed
 |oldCode oldCodeList newCode elements cls mthd highlighterClasses|
 ! !
 !CodeHighlightingService class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.23 2011-09-16 16:37:16 vrany Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.24 2011-09-26 14:37:15 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.23 2011-09-16 16:37:16 vrany Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__CodeHighlightingService.st,v 1.24 2011-09-26 14:37:15 cg Exp $'
 !
 version_SVN
 ^ '�Id: Tools__CodeHighlightingService.st 7715 2011-04-10 16:32:58Z vranyj1 �'
 ! !

changeset 10721	6813188d742b
parent 10710	5aa37ab3189e
child 10729	f4109bfaad31