Use ChangeWorkspace to limit where DartChangeBuilder(s) can edit.

[email protected]

Bug: dart-lang#35402
Change-Id: If5f78b44b69f01d9ddc235401f70cc4aefd3ca37
Reviewed-on: https://dart-review.googlesource.com/c/87382
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_workspace.dart';
 
 /**
  * An object used to provide context information for Dart assist contributors.
@@ -24,4 +25,9 @@ abstract class DartAssistContext {
    * The start of the selection.
    */
   int get selectionOffset;
+
+  /**
+   * The workspace in which the fix contributor operates.
+   */
+  ChangeWorkspace get workspace;
 }

pkg/analysis_server/lib/plugin/edit/fix/fix_dart.dart

@@ -4,6 +4,7 @@
 
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_workspace.dart';
 
 /**
  * An object used to provide context information for [DartFixContributor]s.
@@ -15,4 +16,9 @@ abstract class DartFixContext implements FixContext {
    * The resolution result in which fix operates.
    */
   ResolvedUnitResult get resolveResult;
+
+  /**
+   * The workspace in which the fix contributor operates.
+   */
+  ChangeWorkspace get workspace;
 }

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -9,6 +9,7 @@ import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/services/search/element_visitors.dart';
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/exception/exception.dart';
@@ -73,6 +74,11 @@ abstract class AbstractAnalysisServer {
     return _analyzedFilesGlobs;
   }
 
+  /// The list of current analysis sessions in all contexts.
+  List<AnalysisSession> get currentSessions {
+    return driverMap.values.map((driver) => driver.currentSession).toList();
+  }
+
   /// A table mapping [Folder]s to the [AnalysisDriver]s associated with them.
   Map<Folder, nd.AnalysisDriver> get driverMap => contextManager.driverMap;
 

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

@@ -8,6 +8,7 @@ import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/edit/fix/prefer_int_literals_fix.dart';
 import 'package:analysis_server/src/edit/fix/prefer_mixin_fix.dart';
+import 'package:analysis_server/src/services/correction/change_workspace.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -212,7 +213,8 @@ class EditDartFix {
       return false;
     }
 
-    final dartContext = new DartFixContextImpl(result, error);
+    final workspace = DartChangeWorkspace(server.currentSessions);
+    final dartContext = new DartFixContextImpl(workspace, result, error);
     final processor = new FixProcessor(dartContext);
     Fix fix = await processor.computeFix();
     final location = locationFor(result, error.offset, error.length);

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

@@ -19,6 +19,7 @@ import 'package:analysis_server/src/services/completion/postfix/postfix_completi
 import 'package:analysis_server/src/services/completion/statement/statement_completion.dart';
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
+import 'package:analysis_server/src/services/correction/change_workspace.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analysis_server/src/services/correction/organize_directives.dart';
@@ -183,7 +184,12 @@ class EditDomainHandler extends AbstractRequestHandler {
     //
     ResolvedUnitResult result = await server.getResolvedUnit(file);
     if (result != null) {
-      var context = new DartAssistContextImpl(result, offset, length);
+      var context = new DartAssistContextImpl(
+        DartChangeWorkspace(server.currentSessions),
+        result,
+        offset,
+        length,
+      );
       try {
         AssistProcessor processor = new AssistProcessor(context);
         List<Assist> assists = await processor.compute();
@@ -528,7 +534,8 @@ class EditDomainHandler extends AbstractRequestHandler {
       for (engine.AnalysisError error in result.errors) {
         int errorLine = lineInfo.getLocation(error.offset).lineNumber;
         if (errorLine == requestLine) {
-          var context = new DartFixContextImpl(result, error);
+          var workspace = DartChangeWorkspace(server.currentSessions);
+          var context = new DartFixContextImpl(workspace, result, error);
           List<Fix> fixes =
               await new DartFixContributor().computeFixes(context);
           if (fixes.isNotEmpty) {

pkg/analysis_server/lib/src/edit/fix/prefer_int_literals_fix.dart

@@ -6,6 +6,7 @@ import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/src/edit/edit_dartfix.dart';
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
+import 'package:analysis_server/src/services/correction/change_workspace.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/error/error.dart';
@@ -20,7 +21,12 @@ class PreferIntLiteralsFix extends LinterFix {
     while (literalsToConvert.isNotEmpty) {
       DoubleLiteral literal = literalsToConvert.removeLast();
       AssistProcessor processor = new AssistProcessor(
-        new DartAssistContextImpl(result, literal.offset, 0),
+        new DartAssistContextImpl(
+          DartChangeWorkspace(dartFix.server.currentSessions),
+          result,
+          literal.offset,
+          0,
+        ),
       );
       List<Assist> assists =
           await processor.computeAssist(DartAssistKind.CONVERT_TO_INT_LITERAL);

pkg/analysis_server/lib/src/edit/fix/prefer_mixin_fix.dart

@@ -6,6 +6,7 @@ import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/src/edit/edit_dartfix.dart';
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
+import 'package:analysis_server/src/services/correction/change_workspace.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -37,7 +38,11 @@ class PreferMixinFix extends LinterFix {
       if (declaration is ClassOrMixinDeclaration &&
           declaration.name.name == elem.name) {
         AssistProcessor processor = new AssistProcessor(
-          new DartAssistContextImpl(result, declaration.name.offset, 0),
+          new DartAssistContextImpl(
+              DartChangeWorkspace(dartFix.server.currentSessions),
+              result,
+              declaration.name.offset,
+              0),
         );
         List<Assist> assists = await processor
             .computeAssist(DartAssistKind.CONVERT_CLASS_TO_MIXIN);

pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart

@@ -17,6 +17,7 @@ import 'package:analysis_server/src/lsp/source_edits.dart';
 import 'package:analysis_server/src/protocol_server.dart' show SourceChange;
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
+import 'package:analysis_server/src/services/correction/change_workspace.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -128,7 +129,12 @@ class CodeActionHandler extends MessageHandler<CodeActionParams,
     }
 
     try {
-      var context = new DartAssistContextImpl(unit, offset, length);
+      var context = new DartAssistContextImpl(
+        DartChangeWorkspace(server.currentSessions),
+        unit,
+        offset,
+        length,
+      );
       final processor = new AssistProcessor(context);
       final assists = await processor.compute();
       assists.sort(Assist.SORT_BY_RELEVANCE);
@@ -184,7 +190,8 @@ class CodeActionHandler extends MessageHandler<CodeActionParams,
         // Server lineNumber is one-based so subtract one.
         int errorLine = lineInfo.getLocation(error.offset).lineNumber - 1;
         if (errorLine >= range.start.line && errorLine <= range.end.line) {
-          var context = new DartFixContextImpl(unit, error);
+          var workspace = DartChangeWorkspace(server.currentSessions);
+          var context = new DartFixContextImpl(workspace, unit, error);
           final fixes = await fixContributor.computeFixes(context);
           if (fixes.isNotEmpty) {
             fixes.sort(Fix.SORT_BY_RELEVANCE);

pkg/analysis_server/lib/src/services/correction/assist.dart

@@ -5,11 +5,15 @@
 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_workspace.dart';
 
 /**
  * The implementation of [DartAssistContext].
  */
 class DartAssistContextImpl implements DartAssistContext {
+  @override
+  final ChangeWorkspace workspace;
+
   @override
   final ResolvedUnitResult resolveResult;
 
@@ -19,8 +23,8 @@ class DartAssistContextImpl implements DartAssistContext {
   @override
   final int selectionLength;
 
-  DartAssistContextImpl(
-      this.resolveResult, this.selectionOffset, this.selectionLength);
+  DartAssistContextImpl(this.workspace, this.resolveResult,
+      this.selectionOffset, this.selectionLength);
 }
 
 /**

pkg/analysis_server/lib/src/services/correction/assist_internal.dart

@@ -27,6 +27,7 @@ import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
+import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart'
     hide AssistContributor;
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
@@ -3353,8 +3354,7 @@ class AssistProcessor {
   }
 
   DartChangeBuilder _newDartChangeBuilder() {
-    DartChangeBuilder changeBuilder = new DartChangeBuilder(session);
-    return changeBuilder;
+    return new DartChangeBuilderImpl.forWorkspace(context.workspace);
   }
 
   bool _setupCompute() {