diff --git a/duchain/builders/contextbuilder.cpp b/duchain/builders/contextbuilder.cpp
--- a/duchain/builders/contextbuilder.cpp
+++ b/duchain/builders/contextbuilder.cpp
@@ -168,7 +168,12 @@
 
 RangeInRevision ContextBuilder::editorFindRange(AstNode* fromRange, AstNode* toRange)
 {
-    return m_editor->findRange(fromRange, toRange ? toRange : fromRange);
+    auto range = m_editor->findRange(fromRange, toRange ? toRange : fromRange);
+    if ( fromRange->kind == AstNode::VariableIdentifierKind )
+    {
+        range.start.column++;
+    }
+    return range;
 }
 
 CursorInRevision ContextBuilder::startPos(AstNode* node)
diff --git a/duchain/tests/duchain.cpp b/duchain/tests/duchain.cpp
--- a/duchain/tests/duchain.cpp
+++ b/duchain/tests/duchain.cpp
@@ -512,7 +512,7 @@
     QCOMPARE(var->isStatic(), false);
     QVERIFY(var->type<IntegralType>());
     QVERIFY(var->type<IntegralType>()->dataType() == IntegralType::TypeInt);
-    QVERIFY(var->range() == RangeInRevision(0, 54, 0, 56));
+    QVERIFY(var->range() == RangeInRevision(0, 55, 0, 56));
 }
 
 void TestDUChain::classMemberVarDocBlockType()
@@ -2479,8 +2479,8 @@
     QCOMPARE(dec->uses().keys().count(), 1);
     QCOMPARE(dec->uses().values().count(), 1);
     QCOMPARE(dec->uses().values().first().count(), 2);
-    QCOMPARE(dec->uses().values().first().first(), RangeInRevision(0, 3, 0, 8));
-    QCOMPARE(dec->uses().values().first().at(1), RangeInRevision(0, 27, 0, 32));
+    QCOMPARE(dec->uses().values().first().first(), RangeInRevision(0, 4, 0, 8));
+    QCOMPARE(dec->uses().values().first().at(1), RangeInRevision(0, 28, 0, 32));
 }
 
 void TestDUChain::returnWithoutFunction()
@@ -2912,13 +2912,13 @@
         QCOMPARE(dec->uses().values().count(), 1);
         QCOMPARE(dec->uses().values().first().count(), 4);
         qDebug() << dec->uses().values().first().at(0).castToSimpleRange();
-        QCOMPARE(dec->uses().values().first().at(0), RangeInRevision(1, 16, 1, 20));
+        QCOMPARE(dec->uses().values().first().at(0), RangeInRevision(1, 17, 1, 20));
         qDebug() << dec->uses().values().first().at(1).castToSimpleRange();
-        QCOMPARE(dec->uses().values().first().at(1), RangeInRevision(1, 35, 1, 39));
+        QCOMPARE(dec->uses().values().first().at(1), RangeInRevision(1, 36, 1, 39));
         qDebug() << dec->uses().values().first().at(2).castToSimpleRange();
-        QCOMPARE(dec->uses().values().first().at(2), RangeInRevision(2, 0, 2, 4));
+        QCOMPARE(dec->uses().values().first().at(2), RangeInRevision(2, 1, 2, 4));
         qDebug() << dec->uses().values().first().at(3).castToSimpleRange();
-        QCOMPARE(dec->uses().values().first().at(3), RangeInRevision(3, 0, 3, 4));
+        QCOMPARE(dec->uses().values().first().at(3), RangeInRevision(3, 1, 3, 4));
     }
 
     { // check if asdf got declared
@@ -3886,10 +3886,10 @@
     QVERIFY(top->problems().isEmpty());
     QList< Declaration* > decs = top->findLocalDeclarations(Identifier(QStringLiteral("a")));
     QCOMPARE(decs.size(), 1);
-    QCOMPARE(decs.at(0)->range(), RangeInRevision(1, 19, 1, 21));
+    QCOMPARE(decs.at(0)->range(), RangeInRevision(1, 20, 1, 21));
     QCOMPARE(decs.at(0)->uses().count(), 1);
     QCOMPARE(decs.at(0)->uses().begin()->count(), 1);
-    QCOMPARE(decs.at(0)->uses().begin()->first(), RangeInRevision(2, 2, 2, 4));
+    QCOMPARE(decs.at(0)->uses().begin()->first(), RangeInRevision(2, 3, 2, 4));
 }
 
 
diff --git a/duchain/tests/duchain_multiplefiles.cpp b/duchain/tests/duchain_multiplefiles.cpp
--- a/duchain/tests/duchain_multiplefiles.cpp
+++ b/duchain/tests/duchain_multiplefiles.cpp
@@ -243,7 +243,7 @@
         QCOMPARE(f.topContext()->findDeclarations(Identifier("k")).count(), 1);
         Declaration* kDec = f.topContext()->findDeclarations(Identifier(QStringLiteral("k"))).first();
         QCOMPARE(kDec->rangeInCurrentRevision().start().line(), 1);
-        QCOMPARE(kDec->rangeInCurrentRevision().start().column(), 0);
+        QCOMPARE(kDec->rangeInCurrentRevision().start().column(), 1);
         QCOMPARE(kDec->uses().count(), 1);
         QCOMPARE(kDec->uses().begin()->count(), 1);
         QCOMPARE(kDec->uses().begin()->begin()->start.line, 2);
@@ -261,7 +261,7 @@
         QCOMPARE(f.topContext()->findDeclarations(Identifier("k")).count(), 1);
         Declaration* kDec = f.topContext()->findDeclarations(Identifier(QStringLiteral("k"))).first();
         QCOMPARE(kDec->rangeInCurrentRevision().start().line(), 1);
-        QCOMPARE(kDec->rangeInCurrentRevision().start().column(), 25);
+        QCOMPARE(kDec->rangeInCurrentRevision().start().column(), 26);
         QCOMPARE(kDec->uses().count(), 0);
     }
 }
diff --git a/duchain/tests/uses.cpp b/duchain/tests/uses.cpp
--- a/duchain/tests/uses.cpp
+++ b/duchain/tests/uses.cpp
@@ -169,7 +169,7 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(1, 42 - 3, 1, 44 - 3) << RangeInRevision(1, 46 - 3, 1, 48 - 3) << RangeInRevision(1, 59 - 3, 1, 61 - 3);
+    ranges << RangeInRevision(1, 40, 1, 41) << RangeInRevision(1, 44, 1, 45) << RangeInRevision(1, 57, 1, 58);
     compareUses(top->localDeclarations().at(1), ranges);
 }
 
@@ -183,7 +183,7 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(0, 13, 0, 15) << RangeInRevision(0, 17, 0, 19);
+    ranges << RangeInRevision(0, 14, 0, 15) << RangeInRevision(0, 18, 0, 19);
     compareUses(top->localDeclarations().at(0), ranges);
 }
 
@@ -197,7 +197,7 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(1, 55, 1, 57) << RangeInRevision(1, 59, 1, 61) << RangeInRevision(1, 72, 1, 74);
+    ranges << RangeInRevision(1, 56, 1, 57) << RangeInRevision(1, 60, 1, 61) << RangeInRevision(1, 73, 1, 74);
     compareUses(top->localDeclarations().at(2), ranges);
 }
 
@@ -211,20 +211,20 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(1, 55, 1, 57) << RangeInRevision(1, 59, 1, 61) << RangeInRevision(1, 72, 1, 74);
+    ranges << RangeInRevision(1, 56, 1, 57) << RangeInRevision(1, 60, 1, 61) << RangeInRevision(1, 73, 1, 74);
     compareUses(top->localDeclarations().at(1), ranges);
 }
 
 void TestUses::variableInOtherNamespace()
 {
-    //                        0         1         2         3         4         5         6         7
-    //                        01234567890123456789012345678901234567890123456789012345678901234567890123456789
+    //                        0         1         2         3         4         5         6         7         8
+    //                        012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
     QByteArray method("<?php\nclass A { public $foo; } namespace Foo { $a = new A(); } namespace Bar { $a; $a->foo; foo($a); };");
     TopDUContext* top = parse(method, DumpAll);
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(1, 73, 1, 75) << RangeInRevision(1, 77, 1, 79) << RangeInRevision(1, 90, 1, 92);
+    ranges << RangeInRevision(1, 74, 1, 75) << RangeInRevision(1, 78, 1, 79) << RangeInRevision(1, 91, 1, 92);
     compareUses(top->localDeclarations().at(2), ranges);
 }
 
@@ -239,7 +239,7 @@
     DUChainWriteLocker lock(DUChain::lock());
 
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(0, 43, 0, 45) << RangeInRevision(0, 51, 0, 53) << RangeInRevision(0, 58, 0, 60);
+    ranges << RangeInRevision(0, 44, 0, 45) << RangeInRevision(0, 52, 0, 53) << RangeInRevision(0, 59, 0, 60);
     compareUses(top->localDeclarations().at(1), ranges);
 
     ranges.clear();
@@ -258,7 +258,7 @@
     DUChainWriteLocker lock(DUChain::lock());
 
     //$a
-    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 50, 0, 52));
+    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 51, 0, 52));
 
     //foo
     compareUses(top->childContexts().first()->localDeclarations().first(), RangeInRevision(0, 54, 0, 57));
@@ -275,11 +275,11 @@
     DUChainWriteLocker lock(DUChain::lock());
 
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(0, 25, 0, 27);
-    ranges << RangeInRevision(0, 29, 0, 31);
-    ranges << RangeInRevision(0, 37, 0, 39);
-    ranges << RangeInRevision(0, 41, 0, 43);
-    ranges << RangeInRevision(0, 51, 0, 53);
+    ranges << RangeInRevision(0, 26, 0, 27);
+    ranges << RangeInRevision(0, 30, 0, 31);
+    ranges << RangeInRevision(0, 38, 0, 39);
+    ranges << RangeInRevision(0, 42, 0, 43);
+    ranges << RangeInRevision(0, 52, 0, 53);
     compareUses(top->localDeclarations().at(1), ranges);
 }
 
@@ -288,17 +288,17 @@
     //                 0         1         2         3         4         5         6         7
     //                 01234567890123456789012345678901234567890123456789012345678901234567890123456789
     QByteArray method("<? function foo() { $a='a'; $a; $a=0; $a; $a=false; }");
-    //                                     20      28  32    38  42
+    //                                      21      29  33    39  43
 
     TopDUContext* top = parse(method, DumpAll);
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
 
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(0, 28, 0, 30);
-    ranges << RangeInRevision(0, 32, 0, 34);
-    ranges << RangeInRevision(0, 38, 0, 40);
-    ranges << RangeInRevision(0, 42, 0, 44);
+    ranges << RangeInRevision(0, 29, 0, 30);
+    ranges << RangeInRevision(0, 33, 0, 34);
+    ranges << RangeInRevision(0, 39, 0, 40);
+    ranges << RangeInRevision(0, 43, 0, 44);
     compareUses(top->childContexts().at(1)->localDeclarations().at(0), ranges);
 }
 
@@ -386,8 +386,8 @@
     DUChainWriteLocker lock(DUChain::lock());
 
     compareUses(top->localDeclarations().first(), RangeInRevision(0, 43, 0, 44));
-    compareUses(top->childContexts().first()->localDeclarations().first(), RangeInRevision(0, 46, 0, 50));
-    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 52, 0, 56));
+    compareUses(top->childContexts().first()->localDeclarations().first(), RangeInRevision(0, 47, 0, 50));
+    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 53, 0, 56));
 }
 
 void TestUses::dynamicStaticMemberVariable()
@@ -407,7 +407,7 @@
     dec = top->localDeclarations().at(1);
     QCOMPARE(dec->identifier(), Identifier("var"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(0, 52, 0, 56));
+                    << RangeInRevision(0, 53, 0, 56));
 }
 
 void TestUses::constant()
@@ -495,7 +495,7 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
 
-    compareUses(top->localDeclarations().first(), RangeInRevision(0, 28, 0, 33));
+    compareUses(top->localDeclarations().first(), RangeInRevision(0, 29, 0, 33));
     compareUses(top->childContexts().first()->localDeclarations().first(), RangeInRevision(0, 35, 0, 36));
 }
 
@@ -514,7 +514,7 @@
     ranges << RangeInRevision(0, 85, 0, 85 + 2);
     compareUses(top->localDeclarations().first(), ranges);
 
-    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 70, 0, 70 + 3));
+    compareUses(top->localDeclarations().at(1), RangeInRevision(0, 71, 0, 71 + 2));
 }
 
 void TestUses::classAndConstWithSameName()
@@ -555,7 +555,7 @@
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
 
-    compareUses(top->localDeclarations().first(), RangeInRevision(0, 30, 0, 32));
+    compareUses(top->localDeclarations().first(), RangeInRevision(0, 31, 0, 32));
     compareUses(top->localDeclarations().at(1), RangeInRevision(0, 27, 0, 28));
 }
 
@@ -604,7 +604,7 @@
     DUChainWriteLocker lock(DUChain::lock());
 
     Declaration *d = top->localDeclarations().first();
-    compareUses(d, RangeInRevision(0, 16, 0, 18));
+    compareUses(d, RangeInRevision(0, 17, 0, 18));
 }
 
 void TestUses::foreachArray()
@@ -622,15 +622,15 @@
 
     // $a
     Declaration *d = top->localDeclarations().at(0);
-    compareUses(d, RangeInRevision(0, 26, 0, 28));
+    compareUses(d, RangeInRevision(0, 27, 0, 28));
 
     // $k
     d = top->localDeclarations().at(1);
-    compareUses(d, RangeInRevision(0, 51, 0, 53));
+    compareUses(d, RangeInRevision(0, 52, 0, 53));
 
     // $i
     d = top->localDeclarations().at(2);
-    compareUses(d, RangeInRevision(0, 55, 0, 57));
+    compareUses(d, RangeInRevision(0, 56, 0, 57));
 }
 
 void TestUses::assignmentToMemberArray()
@@ -648,7 +648,7 @@
     QVERIFY(x);
 
     // $this
-    compareUses(x, RangeInRevision(0, 50, 0, 55));
+    compareUses(x, RangeInRevision(0, 51, 0, 55));
 
     // var $y
     Declaration *y = x->logicalInternalContext(top)->findDeclarations(Identifier(QStringLiteral("y"))).first();
@@ -666,9 +666,9 @@
     QVERIFY(a);
     compareUses(a, QList<RangeInRevision>()
                 // $b = $a
-                << RangeInRevision(0, 46, 0, 48)
+                << RangeInRevision(0, 47, 0, 48)
                 // $this->y[$a]
-                << RangeInRevision(0, 59, 0, 61)
+                << RangeInRevision(0, 60, 0, 61)
                );
 }
 
@@ -686,11 +686,11 @@
 
     Declaration* a = top->childContexts().first()->localDeclarations().first();
     QCOMPARE(a->identifier().toString(), QString("a"));
-    compareUses(a, RangeInRevision(0, 68, 0, 70));
+    compareUses(a, RangeInRevision(0, 69, 0, 70));
 
     Declaration* i = top->childContexts().first()->childContexts().first()->localDeclarations().first();
     QCOMPARE(i->identifier().toString(), QString("i"));
-    compareUses(i, RangeInRevision(0, 71, 0, 73));
+    compareUses(i, RangeInRevision(0, 72, 0, 73));
 }
 
 void TestUses::functionParamNewDeclaration()
@@ -705,8 +705,8 @@
 
     Declaration *d = top->childContexts().first()->localDeclarations().first();
     QList<RangeInRevision> ranges;
-    ranges << RangeInRevision(0, 22, 0, 24);
-    ranges << RangeInRevision(0, 26, 0, 28);
+    ranges << RangeInRevision(0, 23, 0, 24);
+    ranges << RangeInRevision(0, 27, 0, 28);
     compareUses(d, ranges);
 }
 
@@ -738,9 +738,9 @@
     QCOMPARE(decs.size(), 1);
     Declaration *d = decs.first();
     compareUses(d, QList<RangeInRevision>()
-                     << RangeInRevision(0, 13, 0, 15)
-                     << RangeInRevision(0, 18, 0, 20)
-                     << RangeInRevision(0, 23, 0, 25)
+                     << RangeInRevision(0, 14, 0, 15)
+                     << RangeInRevision(0, 19, 0, 20)
+                     << RangeInRevision(0, 24, 0, 25)
                 );
 }
 
@@ -903,11 +903,11 @@
     // $a
     QVERIFY(topDecs[2]->identifier().nameEquals(Identifier("a")));
     QVERIFY(dynamic_cast<VariableDeclaration*>(topDecs[2]));
-    compareUses(topDecs[2], RangeInRevision(5, 0, 5, 2));
+    compareUses(topDecs[2], RangeInRevision(5, 1, 5, 2));
     // $b
     QVERIFY(topDecs[3]->identifier().nameEquals(Identifier("b")));
     QVERIFY(dynamic_cast<VariableDeclaration*>(topDecs[3]));
-    compareUses(topDecs[3], RangeInRevision(5, 6, 5, 8));
+    compareUses(topDecs[3], RangeInRevision(5, 7, 5, 8));
 
     // function a
     Declaration* methodADec = topDecs[0]->internalContext()->localDeclarations().first();
@@ -932,8 +932,8 @@
 
     QVector<Declaration*> decs = top->localDeclarations();
     QCOMPARE(decs.size(), 1);
-    QCOMPARE(decs.first()->range(), RangeInRevision(0, 3, 0, 5));
-    compareUses(decs.first(), RangeInRevision(0, 17, 0, 19));
+    QCOMPARE(decs.first()->range(), RangeInRevision(0, 4, 0, 5));
+    compareUses(decs.first(), RangeInRevision(0, 18, 0, 19));
 }
 
 void TestUses::functionArguments()
@@ -951,11 +951,11 @@
 
     // $a
     Declaration *d = top->childContexts().at(0)->localDeclarations().at(0);
-    compareUses(d, RangeInRevision(0, 27, 0, 29));
+    compareUses(d, RangeInRevision(0, 28, 0, 29));
 
     // $b
     d = top->childContexts().at(0)->localDeclarations().at(1);
-    compareUses(d, RangeInRevision(0, 35, 0, 37));
+    compareUses(d, RangeInRevision(0, 36, 0, 37));
 }
 
 void TestUses::namespaces()
@@ -1127,7 +1127,7 @@
 
     Declaration* a = top->localDeclarations().at(0);
     QCOMPARE(a->identifier().toString(), QString("a"));
-    compareUses(a, QList<RangeInRevision>() << RangeInRevision(1, 23, 1, 25) << RangeInRevision(1, 36, 1, 38));
+    compareUses(a, QList<RangeInRevision>() << RangeInRevision(1, 24, 1, 25) << RangeInRevision(1, 37, 1, 38));
 
     Declaration* b = top->localDeclarations().at(1);
     QCOMPARE(b->identifier().toString(), QString("b"));
@@ -1196,8 +1196,8 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 14, 2, 16)
-                    << RangeInRevision(2, 28, 2, 30));
+                    << RangeInRevision(2, 15, 2, 16)
+                    << RangeInRevision(2, 29, 2, 30));
 
     dec = top->childContexts().at(0)->localDeclarations().at(0);
     QVERIFY(dec);
@@ -1244,20 +1244,20 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 14, 2, 16));
+                    << RangeInRevision(2, 15, 2, 16));
 
     dec = top->childContexts().at(0)->localDeclarations().at(0);
     QVERIFY(dec);
     QCOMPARE(dec->identifier(), Identifier("foo"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 31, 2, 35)
-                    << RangeInRevision(2, 43, 2, 47));
+                    << RangeInRevision(2, 32, 2, 35)
+                    << RangeInRevision(2, 44, 2, 47));
 
     dec = top->childContexts().at(1)->localDeclarations().at(0);
     QVERIFY(dec);
     QCOMPARE(dec->identifier(), Identifier("bar"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 37, 2, 41));
+                    << RangeInRevision(2, 38, 2, 41));
 }
 
 void TestUses::instanceofMixedProperty()
@@ -1291,14 +1291,14 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 14, 2, 16));
+                    << RangeInRevision(2, 15, 2, 16));
 
     dec = top->childContexts().at(0)->localDeclarations().at(0);
     QVERIFY(dec);
     QCOMPARE(dec->identifier(), Identifier("foo"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 31, 2, 35)
-                    << RangeInRevision(2, 42, 2, 46));
+                    << RangeInRevision(2, 32, 2, 35)
+                    << RangeInRevision(2, 43, 2, 46));
 
     dec = top->childContexts().at(1)->localDeclarations().at(0);
     QVERIFY(dec);
@@ -1338,19 +1338,19 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 14, 3, 16)
-                    << RangeInRevision(3, 28, 3, 30));
+                    << RangeInRevision(3, 15, 3, 16)
+                    << RangeInRevision(3, 29, 3, 30));
 
     dec = top->localDeclarations().at(2);
     QCOMPARE(dec->identifier(), Identifier("foo"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 32, 3, 36)
-                    << RangeInRevision(3, 44, 3, 48));
+                    << RangeInRevision(3, 33, 3, 36)
+                    << RangeInRevision(3, 45, 3, 48));
 
     dec = top->localDeclarations().at(3);
     QCOMPARE(dec->identifier(), Identifier("bar"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 38, 3, 42));
+                    << RangeInRevision(3, 39, 3, 42));
 }
 
 void TestUses::instanceofDynamicStaticProperty()
@@ -1384,19 +1384,19 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 14, 3, 16)
-                    << RangeInRevision(3, 28, 3, 30));
+                    << RangeInRevision(3, 15, 3, 16)
+                    << RangeInRevision(3, 29, 3, 30));
 
     dec = top->localDeclarations().at(2);
     QCOMPARE(dec->identifier(), Identifier("foo"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 34, 3, 38)
-                    << RangeInRevision(3, 52, 3, 56));
+                    << RangeInRevision(3, 35, 3, 38)
+                    << RangeInRevision(3, 53, 3, 56));
 
     dec = top->localDeclarations().at(3);
     QCOMPARE(dec->identifier(), Identifier("bar"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 43, 3, 47));
+                    << RangeInRevision(3, 44, 3, 47));
 }
 
 void TestUses::instanceofDynamicVariableProperty()
@@ -1430,19 +1430,19 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 14, 3, 16)
-                    << RangeInRevision(3, 28, 3, 30));
+                    << RangeInRevision(3, 15, 3, 16)
+                    << RangeInRevision(3, 29, 3, 30));
 
     dec = top->localDeclarations().at(2);
     QCOMPARE(dec->identifier(), Identifier("foo"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 34, 3, 38)
-                    << RangeInRevision(3, 52, 3, 56));
+                    << RangeInRevision(3, 35, 3, 38)
+                    << RangeInRevision(3, 53, 3, 56));
 
     dec = top->localDeclarations().at(3);
     QCOMPARE(dec->identifier(), Identifier("bar"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(3, 43, 3, 47));
+                    << RangeInRevision(3, 44, 3, 47));
 }
 
 void TestUses::instanceofPropertyArrayAccess()
@@ -1475,8 +1475,8 @@
     QCOMPARE(classType->qualifiedIdentifier(), QualifiedIdentifier("a"));
     QVERIFY(classType->equals(dec->abstractType().data()));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(2, 14, 2, 16)
-                    << RangeInRevision(2, 28, 2, 30));
+                    << RangeInRevision(2, 15, 2, 16)
+                    << RangeInRevision(2, 29, 2, 30));
 
     dec = top->childContexts().at(0)->localDeclarations().at(0);
     QCOMPARE(dec->identifier(), Identifier("foo"));
@@ -1509,7 +1509,7 @@
     Declaration* dec = top->localDeclarations().at(0);
     QCOMPARE(dec->identifier(), Identifier("a"));
     compareUses(dec, QList<RangeInRevision>()
-                    << RangeInRevision(1, 38, 1, 43));
+                    << RangeInRevision(1, 39, 1, 43));
 
     QCOMPARE(top->childContexts().at(0)->localDeclarations().count(), 2);
     QCOMPARE(top->childContexts().at(0)->childContexts().count(), 2);
@@ -1689,8 +1689,8 @@
 
     Declaration *a = top->localDeclarations().at(0);
     QCOMPARE(a->identifier().toString(), QString("a"));
-    compareUses(a, QList<RangeInRevision>() << RangeInRevision(0, 17, 0, 19)
-            << RangeInRevision(0, 37, 0, 39));
+    compareUses(a, QList<RangeInRevision>() << RangeInRevision(0, 18, 0, 19)
+            << RangeInRevision(0, 38, 0, 39));
 }
 
 void TestUses::returnTypeClassFunction() {