added extra globalClassIdentifierColor & emphasis
authorClaus Gittinger <cg@exept.de>
Thu, 04 Mar 1999 13:07:12 +0100
changeset 822 a773bb72cbd6
parent 821 bc543afcc1e6
child 823 a05ffe57b1b8
added extra globalClassIdentifierColor & emphasis
Parser.st
SyntaxHighlighter.st
--- a/Parser.st	Fri Feb 26 16:11:19 1999 +0100
+++ b/Parser.st	Thu Mar 04 13:07:12 1999 +0100
@@ -1766,6 +1766,11 @@
     "Created: / 31.3.1998 / 18:06:24 / cg"
 !
 
+markGlobalClassIdentifierFrom:pos1 to:pos2
+
+    "Created: / 4.3.1999 / 12:52:45 / cg"
+!
+
 markGlobalIdentifierFrom:pos1 to:pos2
 
     "Created: / 31.3.1998 / 15:29:39 / cg"
@@ -4727,6 +4732,6 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.194 1999-02-24 15:22:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.195 1999-03-04 12:07:12 cg Exp $'
 ! !
 Parser initialize!
--- a/SyntaxHighlighter.st	Fri Feb 26 16:11:19 1999 +0100
+++ b/SyntaxHighlighter.st	Thu Mar 04 13:07:12 1999 +0100
@@ -24,7 +24,8 @@
 		superEmphasis hereColor hereEmphasis thisContextColor
 		thisContextEmphasis booleanConstantColor booleanConstantEmphasis
 		constantColor constantEmphasis bracketColor bracketEmphasis
-		instVarIdentifierColor instVarIdentifierEmphasis'
+		instVarIdentifierColor instVarIdentifierEmphasis
+		globalClassIdentifierColor globalClassIdentifierEmphasis'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'System-Compiler'
@@ -206,6 +207,8 @@
     instVarIdentifierColor := prefs instVarIdentifierColor.
     globalIdentifierEmphasis := prefs globalIdentifierEmphasis.
     globalIdentifierColor := prefs globalIdentifierColor.
+    globalClassIdentifierEmphasis := prefs globalClassIdentifierEmphasis.
+    globalClassIdentifierColor := prefs globalClassIdentifierColor.
     unknownIdentifierEmphasis := prefs unknownIdentifierEmphasis.
     unknownIdentifierColor := prefs unknownIdentifierColor.
     commentEmphasis := prefs commentEmphasis.
@@ -234,7 +237,7 @@
     bracketColor := prefs bracketColor.
 
     "Created: / 31.3.1998 / 15:12:55 / cg"
-    "Modified: / 16.4.1998 / 18:40:19 / cg"
+    "Modified: / 4.3.1999 / 12:52:24 / cg"
 ! !
 
 !SyntaxHighlighter methodsFor:'misc'!
@@ -315,6 +318,15 @@
     "Modified: / 1.4.1998 / 12:51:56 / cg"
 !
 
+markGlobalClassIdentifierFrom:pos1 to:pos2
+    self 
+        markFrom:pos1 to:pos2 
+        withEmphasis:globalClassIdentifierEmphasis color:globalClassIdentifierColor
+
+    "Modified: / 31.3.1998 / 18:02:14 / cg"
+    "Created: / 4.3.1999 / 12:53:02 / cg"
+!
+
 markGlobalIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
@@ -456,7 +468,7 @@
 markVariable:v from:pos to:endPos
     "support for syntaxColoring"
 
-    |type|
+    |type globalValue|
 
     type := v type.
     (type == #BlockArg
@@ -470,7 +482,12 @@
         ^ self
     ].
     (type == #GlobalVariable) ifTrue:[
-        self markGlobalIdentifierFrom:pos to:endPos.
+        globalValue := Smalltalk at:v name ifAbsent:nil.
+        globalValue isBehavior ifTrue:[
+            self markGlobalClassIdentifierFrom:pos to:endPos.
+        ] ifFalse:[
+            self markGlobalIdentifierFrom:pos to:endPos.
+        ].
         ^ self
     ].
     (type == #InstanceVariable) ifTrue:[
@@ -481,11 +498,11 @@
     self markIdentifierFrom:pos to:endPos.
 
     "Created: / 16.4.1998 / 18:49:34 / cg"
-    "Modified: / 16.4.1998 / 18:58:10 / cg"
+    "Modified: / 4.3.1999 / 12:56:13 / cg"
 ! !
 
 !SyntaxHighlighter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/SyntaxHighlighter.st,v 1.15 1998-10-24 11:01:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/SyntaxHighlighter.st,v 1.16 1999-03-04 12:06:49 cg Exp $'
 ! !