--- a/Tools__NewSystemBrowser.st Fri Apr 30 11:57:30 2010 +0200
+++ b/Tools__NewSystemBrowser.st Fri Apr 30 11:59:09 2010 +0200
@@ -26248,18 +26248,6 @@
^ self class synchronousUpdate
!
-syntaxHighlightedCodeFor:oldText method:mthd
- |highlighter cls|
-
- cls := mthd mclass ? Object.
- highlighter := mthd syntaxHighlighterClass.
- highlighter == #askClass ifTrue:[
- highlighter := cls syntaxHighlighterClass.
- ].
- highlighter isNil ifTrue:[ ^ oldText ].
- ^ highlighter formatMethod:oldText in:cls.
-!
-
treeForCodeAllowErrors:allowErrors
<resource: #obsolete>
|source tree|
@@ -41063,10 +41051,7 @@
methodsClass isNil ifTrue:[
dontDoIt := true
].
- highlighterClass := currentMethod syntaxHighlighterClass.
- highlighterClass == #askClass ifTrue:[
- highlighterClass := (methodsClass ? Object) syntaxHighlighterClass
- ].
+ highlighterClass := self syntaxHighlighterForMethod:currentMethod.
].
highlighterClass isNil ifTrue:[
syntaxColoringProcess notNil ifTrue:[
@@ -41127,7 +41112,7 @@
newCode := nil.
] do:[
self codeAspect == #method ifTrue:[
- newCode := highlighterClass formatMethod:oldCode in:cls
+ newCode := highlighterClass formatMethod:currentMethod source:oldCode in:cls
] ifFalse:[
self codeAspect == #classDefinition ifTrue:[
newCode := highlighterClass formatExpression:oldCode in:cls
@@ -41163,7 +41148,7 @@
]
] forkAt:prio
- "Modified: / 22-08-2006 / 14:27:09 / cg"
+ "Modified: / 28-04-2010 / 14:27:53 / cg"
!
stopSyntaxHighlightProcess
@@ -41255,6 +41240,38 @@
].
"Modified: / 09-10-2006 / 11:50:17 / cg"
+!
+
+syntaxHighlightedCodeFor:oldText method:mthd
+ |highlighter cls|
+
+ cls := mthd mclass ? Object.
+
+ highlighter := self syntaxHighlighterForMethod:mthd.
+ highlighter isNil ifTrue:[ ^ oldText ].
+ ^ highlighter formatMethod:mthd source:oldText in:cls.
+
+ "Modified: / 28-04-2010 / 13:44:34 / cg"
+!
+
+syntaxHighlighterForMethod:mthd
+ |highlighterClass cls|
+
+ cls := mthd mclass ? Object.
+
+ highlighterClass := mthd syntaxHighlighterClass.
+ highlighterClass == #askClass ifTrue:[
+ highlighterClass := cls syntaxHighlighterClass.
+ ].
+ (mthd isInstrumented
+ and:[ self showCoverageInformation value ]) ifTrue:[
+ highlighterClass == SyntaxHighlighter ifTrue:[
+ highlighterClass := CodeCoverageHighlighter
+ ].
+ ].
+ ^ highlighterClass
+
+ "Created: / 28-04-2010 / 12:49:54 / cg"
! !
!NewSystemBrowser methodsFor:'setup'!
@@ -44302,11 +44319,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1454 2010-04-27 17:03:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1455 2010-04-30 09:59:09 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1454 2010-04-27 17:03:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1455 2010-04-30 09:59:09 cg Exp $'
! !
NewSystemBrowser initialize!