Code completion API refactoring: replace resolveExpression(Expression) with resolveContainingExpres…

pkg/analysis_server/lib/src/services/completion/dart/completion_manager.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 services.completion.dart.manager;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
@@ skipping 207 matching lines @@
   }
 
   /**
    * Throw [AbortCompletion] if the completion request has been aborted.
    */
   void checkAborted() {
     _originalRequest.checkAborted();
   }
 
   @override
-  Future resolveExpression(Expression expression) async {
+  Future resolveContainingExpression(AstNode node) async {
+    // TODO When an Expression can be resolved instead of just an entire unit,
+    // this will be revisited with code searching up the parent until an
+    // Expression is found.
+
+    return resolveContainingStatement(node);
+  }
+
+  @override
+  Future resolveContainingStatement(AstNode node) async {
+    // TODO When a Statement can be resolved instead of just an entire unit,
+    // this will be revisited with code searching up the parent until a
+    // Statement is found.
+
     checkAborted();
 
     // Return immediately if the expression has already been resolved
-    if (expression.propagatedType != null) {
+    if (node is Expression && node.propagatedType != null) {
       return;
     }
 
     // Gracefully degrade if librarySource cannot be determined
     if (librarySource == null) {
       return;
     }
 
     // Resolve declarations in the target unit
     // TODO(danrubel) resolve the expression or containing method
-    // rather than the entire complilation unit
+    // rather than the entire compilation unit
     CompilationUnit resolvedUnit = await _computeAsync(
         this,
         new LibrarySpecificUnit(librarySource, source),
         RESOLVED_UNIT,
         performance,
         'resolve expression');
 
     // TODO(danrubel) determine if the underlying source has been modified
     // in a way that invalidates the completion request
     // and return null
@@ skipping 138 matching lines @@
         performance);
 
     // Resolve the expression in which the completion occurs
     // to properly determine if identifiers should be suggested
     // rather than invocations.
     if (dartRequest.target.maybeFunctionalArgument()) {
       AstNode node = dartRequest.target.containingNode.parent;
       if (node is Expression) {
         const FUNCTIONAL_ARG_TAG = 'resolve expression for isFunctionalArg';
         performance.logStartTime(FUNCTIONAL_ARG_TAG);
-        await dartRequest.resolveExpression(node);
+        await dartRequest.resolveContainingExpression(node);
         performance.logElapseTime(FUNCTIONAL_ARG_TAG);
         dartRequest.checkAborted();
       }
     }
 
     performance.logElapseTime(BUILD_REQUEST_TAG);
     return dartRequest;
   }
 
   static Future _computeAsync(
@@ skipping 70 matching lines @@
               // Replacement range for import URI
               return new ReplacementRange(start, end - start);
             }
           }
         }
       }
     }
     return new ReplacementRange(requestOffset, 0);
   }
 }