--- a/SyntaxHighlighter2.st	Mon Jun 24 16:20:38 2013 +0200
+++ b/SyntaxHighlighter2.st	Mon Jun 24 16:20:50 2013 +0200
@@ -708,6 +708,11 @@
     "Modified: / 18-11-2011 / 14:54:53 / cg"
 !
 
+markLocalIdentifierFrom:pos1 to:pos2
+    super markLocalIdentifierFrom:pos1 to:pos2.
+    self rememberVariableElementFor:tokenName type:#MethodVariable from:pos1 to:pos2 assigned:false
+!
+
 markMethodArgumentIdentifierFrom:pos1 to:pos2
     super markMethodArgumentIdentifierFrom:pos1 to:pos2.
     self rememberVariableElementFor:tokenName type:#MethodArg from:pos1 to:pos2 assigned:false
@@ -764,14 +769,17 @@
 !
 
 rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2 
-    self rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2 assigned:true
+    self rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2 assigned:false
 !
 
 rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2 assigned:assigned
     |element prev|
 
     prev := (lastVariableElements at:typeSymbol ifAbsentPut:[Dictionary new]) at:name ifAbsent:[nil].
-    (prev notNil and:[prev start == pos1]) ifTrue:[^ self].
+    (prev notNil and:[prev start == pos1]) ifTrue:[
+        prev assigned:assigned.
+        ^ self
+    ].
 
     element := (SyntaxElementVariable from: pos1 to: pos2 type:typeSymbol value: name assigned:assigned) name:name.
 
@@ -786,14 +794,14 @@
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.17 2013-06-24 14:20:50 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.17 2013-06-24 14:20:50 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
+    ^ '$Id: SyntaxHighlighter2.st,v 1.17 2013-06-24 14:20:50 cg Exp $'
 ! !