--- a/Tools__CodeNavigationService.st	Mon Feb 02 12:54:08 2015 +0100
+++ b/Tools__CodeNavigationService.st	Mon Feb 02 12:56:05 2015 +0100
@@ -520,13 +520,29 @@
 
 !CodeNavigationService methodsFor:'misc'!
 
+highlightClassVariable:name
+    "interface from browser (when a class var is selected)"
+
+    self highlightVariable:name isClassVariable:true
+!
+
 highlightInstanceVariable:name
+    "interface from browser (when an inst var is selected)"
+
+    self highlightVariable:name isClassVariable:false
+!
+
+highlightVariable:name isClassVariable:isClassVariable
+    "interface from browser (when an inst or class var is selected)"
+
     |element|
 
     element := (codeView syntaxElements ? #()) 
                     detect:[:e |     
                         e isVariable
-                        and:[ e isInstanceVariable
+                        and:[ (isClassVariable 
+                                    ifTrue:[e isClassVariable ]
+                                    ifFalse:[e isInstanceVariable ])
                         and:[ e name = name ]]
                     ] ifNone:nil.
 
@@ -848,14 +864,14 @@
 !CodeNavigationService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.47 2014-06-04 09:12:47 az Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.48 2015-02-02 11:56:05 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.47 2014-06-04 09:12:47 az Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.48 2015-02-02 11:56:05 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeNavigationService.st,v 1.47 2014-06-04 09:12:47 az Exp $'
+    ^ '$Id: Tools__CodeNavigationService.st,v 1.48 2015-02-02 11:56:05 cg Exp $'
 ! !