Remove ability to disable new analysis driver

pkg/analysis_server/lib/src/edit/edit_domain.dart

 // Copyright (c) 2014, 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.
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
@@ skipping 18 matching lines @@
 import 'package:analyzer/error/error.dart' as engine;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/element/ast_provider.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart' as engine;
 import 'package:analyzer/src/error/codes.dart' as engine;
 import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/parser.dart' as engine;
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/task/dart.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
 import 'package:analyzer_plugin/protocol/protocol_constants.dart' as plugin;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:dart_style/dart_style.dart';
 
 int test_resetCount = 0;
 
 bool test_simulateRefactoringException_change = false;
 bool test_simulateRefactoringException_final = false;
 bool test_simulateRefactoringException_init = false;
@@ skipping 25 matching lines @@
     _newRefactoringManager();
   }
 
   Response format(Request request) {
     EditFormatParams params = new EditFormatParams.fromRequest(request);
     String file = params.file;
 
     String unformattedSource;
     try {
       Source source = server.resourceProvider.getFile(file).createSource();
-      if (server.options.enableNewAnalysisDriver) {
-        unformattedSource = server.fileContentOverlay[file];
-      } else {
-        unformattedSource = server.overlayState.getContents(source);
-      }
-      unformattedSource ??= source.contents.data;
+      unformattedSource =
+          server.fileContentOverlay[file] ?? source.contents.data;
     } catch (e) {
       return new Response.formatInvalidFile(request);
     }
 
     int start = params.selectionOffset;
     int length = params.selectionLength;
 
     // No need to preserve 0,0 selection
     if (start == 0 && length == 0) {
       start = null;
@@ skipping 237 matching lines @@
 
   Future<Null> organizeDirectives(Request request) async {
     var params = new EditOrganizeDirectivesParams.fromRequest(request);
     // prepare file
     String file = params.file;
     if (!engine.AnalysisEngine.isDartFileName(file)) {
       server.sendResponse(new Response.fileNotAnalyzed(request, file));
       return;
     }
     // Prepare the file information.
-    int fileStamp;
-    String code;
-    CompilationUnit unit;
-    List<engine.AnalysisError> errors;
-    if (server.options.enableNewAnalysisDriver) {
-      AnalysisResult result = await server.getAnalysisResult(file);
-      if (result == null) {
-        server.sendResponse(new Response.fileNotAnalyzed(request, file));
-        return;
-      }
-      fileStamp = -1;
-      code = result.content;
-      unit = result.unit;
-      errors = result.errors;
-    } else {
-      // prepare resolved unit
-      unit = await server.getResolvedCompilationUnit(file);
-      if (unit == null) {
-        server.sendResponse(new Response.fileNotAnalyzed(request, file));
-        return;
-      }
-      // prepare context
-      CompilationUnitElement compilationUnitElement =
-          resolutionMap.elementDeclaredByCompilationUnit(unit);
-      engine.AnalysisContext context = compilationUnitElement.context;
-      Source source = compilationUnitElement.source;
-      errors = context.computeErrors(source);
-      // prepare code
-      fileStamp = context.getModificationStamp(source);
-      code = context.getContents(source).data;
+    AnalysisResult result = await server.getAnalysisResult(file);
+    if (result == null) {
+      server.sendResponse(new Response.fileNotAnalyzed(request, file));
+      return;
     }
+    int fileStamp = -1;
+    String code = result.content;
+    CompilationUnit unit = result.unit;
+    List<engine.AnalysisError> errors = result.errors;
     // check if there are scan/parse errors in the file
     int numScanParseErrors = _getNumberOfScanParseErrors(errors);
     if (numScanParseErrors != 0) {
       server.sendResponse(new Response.organizeDirectivesError(
           request, 'File has $numScanParseErrors scan/parse errors.'));
       return;
     }
     // do organize
     DirectiveOrganizer sorter = new DirectiveOrganizer(code, unit, errors);
     List<SourceEdit> edits = sorter.organize();
     SourceFileEdit fileEdit = new SourceFileEdit(file, fileStamp, edits: edits);
     server.sendResponse(
         new EditOrganizeDirectivesResult(fileEdit).toResponse(request.id));
   }
 
   Future<Null> sortMembers(Request request) async {
     var params = new EditSortMembersParams.fromRequest(request);
     // prepare file
     String file = params.file;
     if (!engine.AnalysisEngine.isDartFileName(file)) {
       server.sendResponse(new Response.sortMembersInvalidFile(request));
       return;
     }
     // Prepare the file information.
-    int fileStamp;
-    String code;
-    CompilationUnit unit;
-    List<engine.AnalysisError> errors;
-    if (server.options.enableNewAnalysisDriver) {
-      AnalysisDriver driver = server.getAnalysisDriver(file);
-      ParseResult result = await driver?.parseFile(file);
-      if (result == null) {
-        server.sendResponse(new Response.fileNotAnalyzed(request, file));
-        return;
-      }
-      fileStamp = -1;
-      code = result.content;
-      unit = result.unit;
-      errors = result.errors;
-    } else {
-      // prepare location
-      ContextSourcePair contextSource = server.getContextSourcePair(file);
-      engine.AnalysisContext context = contextSource.context;
-      Source source = contextSource.source;
-      if (context == null || source == null) {
-        server.sendResponse(new Response.sortMembersInvalidFile(request));
-        return;
-      }
-      // prepare code
-      fileStamp = context.getModificationStamp(source);
-      code = context.getContents(source).data;
-      // prepare parsed unit
-      try {
-        unit = context.parseCompilationUnit(source);
-      } catch (e) {
-        server.sendResponse(new Response.sortMembersInvalidFile(request));
-        return;
-      }
-      // Get the errors.
-      errors = context.getErrors(source).errors;
+    AnalysisDriver driver = server.getAnalysisDriver(file);
+    ParseResult result = await driver?.parseFile(file);
+    if (result == null) {
+      server.sendResponse(new Response.fileNotAnalyzed(request, file));
+      return;
     }
+    int fileStamp = -1;
+    String code = result.content;
+    CompilationUnit unit = result.unit;
+    List<engine.AnalysisError> errors = result.errors;
     // Check if there are scan/parse errors in the file.
     int numScanParseErrors = _getNumberOfScanParseErrors(errors);
     if (numScanParseErrors != 0) {
       server.sendResponse(
           new Response.sortMembersParseErrors(request, numScanParseErrors));
       return;
     }
     // Do sort.
     MemberSorter sorter = new MemberSorter(code, unit);
     List<SourceEdit> edits = sorter.sort();
@@ skipping 256 matching lines @@
         cancel();
       } else {
         server.instrumentationService.logException(exception, stackTrace);
         server.sendResponse(
             new Response.serverError(_request, exception, stackTrace));
       }
       _reset();
     });
   }
 
-  /**
-   * Perform enough analysis to be able to perform refactoring of the given
-   * [kind] in the given [file].
-   */
-  Future<Null> _analyzeForRefactoring(String file, RefactoringKind kind) async {
-    if (server.options.enableNewAnalysisDriver) {
-      return;
-    }
-    // "Extract Local" and "Inline Local" refactorings need only local analysis.
-    if (kind == RefactoringKind.EXTRACT_LOCAL_VARIABLE ||
-        kind == RefactoringKind.INLINE_LOCAL_VARIABLE) {
-      ContextSourcePair pair = server.getContextSourcePair(file);
-      engine.AnalysisContext context = pair.context;
-      Source source = pair.source;
-      if (context != null && source != null) {
-        if (context.computeResult(source, SOURCE_KIND) == SourceKind.LIBRARY) {
-          await context.computeResolvedCompilationUnitAsync(source, source);
-          return;
-        }
-      }
-    }
-    // A refactoring for which we cannot optimize analysis.
-    // So, wait for full analysis.
-    await server.onAnalysisComplete;
-  }
-
   void _checkForReset_afterCreateChange() {
     if (test_simulateRefactoringReset_afterCreateChange) {
       _reset();
     }
     if (refactoring == null) {
       throw new _ResetError();
     }
   }
 
   void _checkForReset_afterFinalConditions() {
@@ skipping 13 matching lines @@
       throw new _ResetError();
     }
   }
 
   /**
    * Initializes this context to perform a refactoring with the specified
    * parameters. The existing [Refactoring] is reused or created as needed.
    */
   Future _init(
       RefactoringKind kind, String file, int offset, int length) async {
-    await _analyzeForRefactoring(file, kind);
     // check if we can continue with the existing Refactoring instance
     if (this.kind == kind &&
         this.file == file &&
         this.offset == offset &&
         this.length == length) {
       return;
     }
     _reset();
     this.kind = kind;
     this.file = file;
@@ skipping 55 matching lines @@
     }
     if (kind == RefactoringKind.INLINE_METHOD) {
       CompilationUnit unit = await server.getResolvedCompilationUnit(file);
       if (unit != null) {
         _resetOnAnalysisStarted();
         refactoring = new InlineMethodRefactoring(
             searchEngine, server.getAstProvider(file), unit, offset);
       }
     }
     if (kind == RefactoringKind.MOVE_FILE) {
-      _resetOnAnalysisStarted();
-      ContextSourcePair contextSource = server.getContextSourcePair(file);
-      engine.AnalysisContext context = contextSource.context;
-      Source source = contextSource.source;
-      refactoring = new MoveFileRefactoring(
-          server.resourceProvider, searchEngine, context, source, file);
+      // TODO(brianwilkerson) Re-implement this refactoring under the new analysis driver
+//      _resetOnAnalysisStarted();
+//      ContextSourcePair contextSource = server.getContextSourcePair(file);
+//      engine.AnalysisContext context = contextSource.context;
+//      Source source = contextSource.source;
+//      refactoring = new MoveFileRefactoring(
+//          server.resourceProvider, searchEngine, context, source, file);
     }
     if (kind == RefactoringKind.RENAME) {
       AstNode node = await server.getNodeAtOffset(file, offset);
       Element element = server.getElementOfNode(node);
       if (node != null && element != null) {
         if (element is FieldFormalParameterElement) {
           element = (element as FieldFormalParameterElement).field;
         }
         // climb from "Class" in "new Class.named()" to "Class.named"
         if (node.parent is TypeName && node.parent.parent is ConstructorName) {
@@ skipping 79 matching lines @@
     subscriptionToReset?.cancel();
     subscriptionToReset = server.onAnalysisStarted.listen((_) => _reset());
   }
 
   /**
    * We're performing a refactoring that affects only the given [file].
    * So, when the [file] resolution is changed, we need to reset refactoring.
    * But when any other file is changed or analyzed, we can continue.
    */
   void _resetOnFileResolutionChanged(String file) {
-    if (server.options.enableNewAnalysisDriver) {
-      return;
-    }
-    subscriptionToReset?.cancel();
-    subscriptionToReset = server
-        .getAnalysisContext(file)
-        ?.onResultChanged(RESOLVED_UNIT)
-        ?.listen((event) {
-      Source targetSource = event.target.source;
-      if (targetSource?.fullName == file) {
-        _reset();
-      }
-    });
+    // TODO(brianwilkerson) Decide whether we want to implement this
+    // functionality for the new analysis driver or whether we should remove
+    // this method.
   }
 
   void _sendResultResponse() {
     // ignore if was cancelled
     if (request == null) {
       return;
     }
     // set feedback
     result.feedback = feedback;
     // set problems
@@ skipping 48 matching lines @@
     }
     return new RefactoringStatus();
   }
 }
 
 /**
  * [_RefactoringManager] throws instances of this class internally to stop
  * processing in a manager that was reset.
  */
 class _ResetError {}