Issue 25030. Fix for searching variable declaration when there is no whitespace after the type.

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 1818 matching lines @@
       AnalysisContext context, AnalysisTarget target) {
     return new ComputeConstantValueTask(context, target);
   }
 }
 
 /**
  * A task that computes the [INFERABLE_STATIC_VARIABLE_DEPENDENCIES] for a
  * static variable whose type should be inferred.
  */
 class ComputeInferableStaticVariableDependenciesTask
-    extends ConstantEvaluationAnalysisTask {
+    extends InferStaticVariableTask {
   /**
    * The name of the [RESOLVED_UNIT5] input.
    */
   static const String UNIT_INPUT = 'UNIT_INPUT';
 
   static final TaskDescriptor DESCRIPTOR = new TaskDescriptor(
       'ComputeInferableStaticVariableDependenciesTask',
       createTask,
       buildInputs,
       <ResultDescriptor>[INFERABLE_STATIC_VARIABLE_DEPENDENCIES]);
 
   ComputeInferableStaticVariableDependenciesTask(
       InternalAnalysisContext context, VariableElement variable)
       : super(context, variable);
 
   @override
   TaskDescriptor get descriptor => DESCRIPTOR;
 
   @override
   void internalPerform() {
     //
     // Prepare inputs.
     //
-    VariableElement variable = target;
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     //
     // Compute dependencies.
     //
-    NodeLocator locator = new NodeLocator(variable.nameOffset);
-    AstNode node = locator.searchWithin(unit);
-    VariableDeclaration declaration =
-        node.getAncestor((AstNode ancestor) => ancestor is VariableDeclaration);
-    if (declaration == null || declaration.name != node) {
-      throw new AnalysisException(
-          "NodeLocator failed to find a variable's declaration");
-    }
+    VariableDeclaration declaration = getDeclaration(unit);
     VariableGatherer gatherer = new VariableGatherer(_isInferableStatic);
     declaration.initializer.accept(gatherer);
     //
     // Record outputs.
     //
     outputs[INFERABLE_STATIC_VARIABLE_DEPENDENCIES] = gatherer.results.toList();
   }
 
   /**
    * Return `true` if the given [variable] is a static variable whose type
@@ skipping 134 matching lines @@
   static ComputeLibraryCycleTask createTask(
       AnalysisContext context, AnalysisTarget target) {
     return new ComputeLibraryCycleTask(context, target);
   }
 }
 
 /**
  * A task that computes the [PROPAGABLE_VARIABLE_DEPENDENCIES] for a variable.
  */
 class ComputePropagableVariableDependenciesTask
-    extends ConstantEvaluationAnalysisTask {
+    extends InferStaticVariableTask {
   /**
    * The name of the [RESOLVED_UNIT5] input.
    */
   static const String UNIT_INPUT = 'UNIT_INPUT';
 
   static final TaskDescriptor DESCRIPTOR = new TaskDescriptor(
       'ComputePropagableVariableDependenciesTask',
       createTask,
       buildInputs,
       <ResultDescriptor>[PROPAGABLE_VARIABLE_DEPENDENCIES]);
 
   ComputePropagableVariableDependenciesTask(
       InternalAnalysisContext context, VariableElement variable)
       : super(context, variable);
 
   @override
   TaskDescriptor get descriptor => DESCRIPTOR;
 
   @override
   void internalPerform() {
     //
     // Prepare inputs.
     //
-    VariableElement variable = target;
     CompilationUnit unit = getRequiredInput(UNIT_INPUT);
     //
     // Compute dependencies.
     //
-    NodeLocator locator = new NodeLocator(variable.nameOffset);
-    AstNode node = locator.searchWithin(unit);
-    VariableDeclaration declaration =
-        node.getAncestor((AstNode ancestor) => ancestor is VariableDeclaration);
-    if (declaration == null || declaration.name != node) {
-      throw new AnalysisException(
-          "NodeLocator failed to find a variable's declaration");
-    }
+    VariableDeclaration declaration = getDeclaration(unit);
     VariableGatherer gatherer = new VariableGatherer(_isPropagable);
     declaration.initializer.accept(gatherer);
     //
     // Record outputs.
     //
     outputs[PROPAGABLE_VARIABLE_DEPENDENCIES] = gatherer.results.toList();
   }
 
   /**
    * Return `true` if the given [variable] is a variable whose type can be
@@ skipping 885 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;
-    NodeLocator locator = new NodeLocator(variable.nameOffset);
+    // 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);
     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}");
+          "Failed to find the declaration of the variable "
+          "${variable.displayName} in ${variable.source}");
     }
     return declaration;
   }
 }
 
 /**
  * A task that ensures that all of the inferable static variables in a
  * compilation unit have had their type inferred.
  */
 class InferStaticVariableTypesInUnitTask extends SourceBasedAnalysisTask {
@@ skipping 2293 matching lines @@
 
   @override
   bool moveNext() {
     if (_newSources.isEmpty) {
       return false;
     }
     currentTarget = _newSources.removeLast();
     return true;
   }
 }