New NodeLocator which uses positions of characters, not between them.

pkg/analyzer/lib/src/task/dart.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.task.dart;
 
 import 'dart:collection';
 
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/generated/ast.dart';
@@ skipping 2935 matching lines @@
   InferStaticVariableTask(
       InternalAnalysisContext context, VariableElement variable)
       : super(context, variable);
 
   /**
    * Return the declaration of the target within the given compilation [unit].
    * Throw an exception if the declaration cannot be found.
    */
   VariableDeclaration getDeclaration(CompilationUnit unit) {
     VariableElement variable = target;
-    // Usually: Type ^name = ...
-    // Sometimes there is no space after the type: List<Type>^name = ...
-    // So, we need to use an offset within (or right after) the name:
-    //   Type n^ame =
-    //   List<Type>n^ame =
-    //   Type x^=
-    int searchOffset = variable.nameOffset + 1;
-    NodeLocator locator = new NodeLocator(searchOffset);
-    AstNode node = locator.searchWithin(unit);
+    AstNode node = new NodeLocator2(variable.nameOffset).searchWithin(unit);
     VariableDeclaration declaration =
         node.getAncestor((AstNode ancestor) => ancestor is VariableDeclaration);
     if (declaration == null || declaration.name != node) {
       throw new AnalysisException(
           "Failed to find the declaration of the variable "
           "${variable.displayName} in ${variable.source}");
     }
     return declaration;
   }
 }
@@ skipping 2299 matching lines @@
 
   @override
   bool moveNext() {
     if (_newSources.isEmpty) {
       return false;
     }
     currentTarget = _newSources.removeLast();
     return true;
   }
 }