Remove unused analysisContext from completion request and contributors

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/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/ide_options.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show CompletionContributor, CompletionRequest;
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_plugin.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/completion_performance.dart';
 import 'package:analysis_server/src/services/completion/dart/common_usage_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart/optype.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/context/context.dart' show AnalysisFutureHelper;
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisResult;
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/task/dart.dart';
-import 'package:analyzer/task/dart.dart';
 import 'package:analyzer/task/model.dart';
 
 /**
  * [DartCompletionManager] determines if a completion request is Dart specific
  * and forwards those requests to all [DartCompletionContributor]s.
  */
 class DartCompletionManager implements CompletionContributor {
   /**
    * The [contributionSorter] is a long-lived object that isn't allowed
    * to maintain state between calls to [DartContributionSorter#sort(...)].
@@ skipping 59 matching lines @@
 }
 
 /**
  * The information about a requested list of completions within a Dart file.
  */
 class DartCompletionRequestImpl implements DartCompletionRequest {
   @override
   final AnalysisResult result;
 
   @override
-  final AnalysisContext context;
-
-  @override
   IdeOptions ideOptions;
 
   @override
+  final LibraryElement coreLib;
+
+  @override
   final Source source;
 
   @override
   final int offset;
 
   @override
   Expression dotTarget;
 
   @override
   Source librarySource;
 
   @override
   final ResourceProvider resourceProvider;
 
   @override
   CompletionTarget target;
 
   /**
-   * The [LibraryElement] representing dart:core
-   */
-  LibraryElement _coreLib;
-
-  /**
    * The [DartType] for Object in dart:core
    */
   InterfaceType _objectType;
 
   OpType _opType;
 
   final CompletionRequest _originalRequest;
 
   final CompletionPerformance performance;
 
   DartCompletionRequestImpl._(
       this.result,
-      this.context,
       this.resourceProvider,
+      this.coreLib,
       this.librarySource,
       this.source,
       this.offset,
       CompilationUnit unit,
       this._originalRequest,
       this.performance,
       this.ideOptions) {
     _updateTargets(unit);
   }
 
   @override
-  LibraryElement get coreLib {
-    if (result != null) {
-      AnalysisContext context =
-          resolutionMap.elementDeclaredByCompilationUnit(result.unit).context;
-      _coreLib = context.typeProvider.objectType.element.library;
-    } else {
-      Source coreUri = sourceFactory.forUri('dart:core');
-      _coreLib = context.computeLibraryElement(coreUri);
-    }
-    return _coreLib;
-  }
-
-  @override
   bool get includeIdentifiers {
     return opType.includeIdentifiers;
   }
 
   @override
   LibraryElement get libraryElement {
     //TODO(danrubel) build the library element rather than all the declarations
     CompilationUnit unit = target.unit;
     if (unit != null) {
       CompilationUnitElement elem = unit.element;
@@ skipping 13 matching lines @@
   }
 
   OpType get opType {
     if (_opType == null) {
       _opType = new OpType.forCompletion(target, offset);
     }
     return _opType;
   }
 
   @override
-  String get sourceContents {
-    if (result != null) {
-      return result.content;
-    } else {
-      return context.getContents(source)?.data;
-    }
-  }
+  String get sourceContents => result.content;
 
   @override
-  SourceFactory get sourceFactory {
-    return context?.sourceFactory ?? result.sourceFactory;
-  }
+  SourceFactory get sourceFactory => result.sourceFactory;
 
   /**
    * Throw [AbortCompletion] if the completion request has been aborted.
    */
   void checkAborted() {
     _originalRequest.checkAborted();
   }
 
   /**
    * Update the completion [target] and [dotTarget] based on the given [unit].
@@ skipping 32 matching lines @@
   static Future<DartCompletionRequest> from(CompletionRequest request,
       {ResultDescriptor resultDescriptor}) async {
     request.checkAborted();
     CompletionPerformance performance =
         (request as CompletionRequestImpl).performance;
     const BUILD_REQUEST_TAG = 'build DartCompletionRequest';
     performance.logStartTime(BUILD_REQUEST_TAG);
 
     Source libSource;
     CompilationUnit unit;
-    if (request.context == null) {
-      unit = request.result.unit;
-      // TODO(scheglov) support for parts
-      libSource = resolutionMap.elementDeclaredByCompilationUnit(unit).source;
-    } else {
-      Source source = request.source;
-      AnalysisContext context = request.context;
+    unit = request.result.unit;
+    // TODO(scheglov) support for parts
+    libSource = resolutionMap.elementDeclaredByCompilationUnit(unit).source;
 
-      const PARSE_TAG = 'parse unit';
-      performance.logStartTime(PARSE_TAG);
-      unit = request.context.computeResult(source, PARSED_UNIT);
-      performance.logElapseTime(PARSE_TAG);
-
-      if (unit.directives.any((d) => d is PartOfDirective)) {
-        List<Source> libraries = context.getLibrariesContaining(source);
-        if (libraries.isNotEmpty) {
-          libSource = libraries[0];
-        }
-      } else {
-        libSource = source;
-      }
-
-      // Most (all?) contributors need declarations in scope to be resolved
-      if (libSource != null) {
-        unit = await _computeAsync(
-            request,
-            new LibrarySpecificUnit(libSource, source),
-            resultDescriptor ?? RESOLVED_UNIT5,
-            performance,
-            'resolve declarations');
-      }
-    }
+    LibraryElement coreLib =
+        await request.result.driver.getLibraryByUri('dart:core');
 
     DartCompletionRequestImpl dartRequest = new DartCompletionRequestImpl._(
         request.result,
-        request.context,
         request.resourceProvider,
+        coreLib,
         libSource,
         request.source,
         request.offset,
         unit,
         request,
         performance,
         request.ideOptions);
 
     performance.logElapseTime(BUILD_REQUEST_TAG);
     return dartRequest;
   }
-
-  static Future _computeAsync(
-      CompletionRequest request,
-      AnalysisTarget target,
-      ResultDescriptor descriptor,
-      CompletionPerformance performance,
-      String perfTag) async {
-    request.checkAborted();
-    performance.logStartTime(perfTag);
-    var result;
-    try {
-      result =
-          await new AnalysisFutureHelper(request.context, target, descriptor)
-              .computeAsync();
-    } catch (e, s) {
-      if (e is AnalysisNotScheduledError) {
-        request.checkAborted();
-      }
-      throw new AnalysisException(
-          'failed to $perfTag', new CaughtException(e, s));
-    }
-    request.checkAborted();
-    return result;
-  }
 }
 
 /**
  * Utility class for computing the code completion replacement range
  */
 class ReplacementRange {
   int offset;
   int length;
 
   ReplacementRange(this.offset, this.length);
@@ skipping 36 matching lines @@
           if (start <= requestOffset && requestOffset <= end) {
             // Replacement range for import URI
             return new ReplacementRange(start, end - start);
           }
         }
       }
     }
     return new ReplacementRange(requestOffset, 0);
   }
 }