--- a/SyntaxHighlighter2.st	Sun Jun 23 12:44:40 2013 +0200
+++ b/SyntaxHighlighter2.st	Sun Jun 23 12:44:44 2013 +0200
@@ -694,7 +694,7 @@
         ]
     ].
 
-    elements add: (SyntaxElementVariable from: pos1 to: pos2 type: #class value: cls)
+    elements add: ((SyntaxElementVariable from: pos1 to: pos2 type: #class value: cls) name:name)
 
     "Created: / 14-02-2010 / 14:08:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 15-02-2010 / 10:53:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -717,7 +717,7 @@
     "don't create symbols for partial typed selectors"
     selectorSymbol := selectorString asSymbolIfInterned.
 
-    element := SyntaxElement from: pos1 to: pos2 type: #selector value: selectorSymbol ? selectorString.
+    element := SyntaxElement from: pos1 to: pos2 type: #selector value: (selectorSymbol ? selectorString).
     lastSelectorElement ifNotNil:[lastSelectorElement next: element].
     elements add: element.
     lastSelectorElement := element.
@@ -765,7 +765,7 @@
     prev := (lastVariableElements at:typeSymbol ifAbsentPut:[Dictionary new]) at:name ifAbsent:[nil].
     (prev notNil and:[prev start == pos1]) ifTrue:[^ self].
 
-    element := SyntaxElementVariable from: pos1 to: pos2 type:typeSymbol value: name assigned:assigned.
+    element := (SyntaxElementVariable from: pos1 to: pos2 type:typeSymbol value: name assigned:assigned) name:name.
 
     prev notNil ifTrue:[prev next:element].
     (lastVariableElements at:typeSymbol) at:name put:element.
@@ -778,10 +778,10 @@
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.14 2013-06-14 14:31:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: SyntaxHighlighter2.st,v 1.14 2013-06-14 14:31:48 cg Exp $'
+    ^ '$Id: SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
 ! !