Version 2.16.0-102.0.dev

Merge commit '4122236c30352fdcdb2ecdc6292d47bc3e755311' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/cider/fixes.dart

@@ -7,12 +7,14 @@ 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/dart/top_level_declarations.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
+import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/instrumentation/service.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/analysis/performance_logger.dart';
 import 'package:analyzer/src/dart/micro/resolve_file.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_workspace.dart';
 
 class CiderErrorFixes {
   final AnalysisError error;
@@ -47,12 +49,11 @@ class CiderFixesComputer {
         var errorLine = lineInfo.getLocation(error.offset).lineNumber;
         if (errorLine == lineNumber) {
           var workspace = DartChangeWorkspace([resolvedUnit.session]);
-          var context = DartFixContextImpl(
-            InstrumentationService.NULL_SERVICE,
+          var context = _CiderDartFixContextImpl(
+            _fileResolver,
             workspace,
             resolvedUnit,
             error,
-            _topLevelDeclarations,
           );
 
           var fixes = await DartFixContributor().computeFixes(context);
@@ -67,9 +68,23 @@ class CiderFixesComputer {
 
     return result;
   }
+}
+
+class _CiderDartFixContextImpl extends DartFixContextImpl {
+  final FileResolver _fileResolver;
+
+  _CiderDartFixContextImpl(
+    this._fileResolver,
+    ChangeWorkspace workspace,
+    ResolvedUnitResult resolvedUnit,
+    AnalysisError error,
+  ) : super(InstrumentationService.NULL_SERVICE, workspace, resolvedUnit,
+            error);
 
-  Future<Map<LibraryElement, List<Element>>> _topLevelDeclarations(
-      String name) async {
+  @override
+  Future<Map<LibraryElement, List<Element>>> getTopLevelDeclarations(
+    String name,
+  ) async {
     var result = <LibraryElement, List<Element>>{};
     var files = _fileResolver.getFilesWithTopLevelDeclarations(name);
     for (var file in files) {

pkg/analysis_server/lib/src/context_manager.dart

@@ -15,7 +15,6 @@ import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/dart/analysis/file_content_cache.dart';
 import 'package:analyzer/src/dart/analysis/performance_logger.dart';
-import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/lint/linter.dart';
@@ -279,7 +278,7 @@ class ContextManagerImpl implements ContextManager {
     var convertedErrors = const <protocol.AnalysisError>[];
     try {
       var content = _readFile(path);
-      var lineInfo = _computeLineInfo(content);
+      var lineInfo = LineInfo.fromContent(content);
       var errors = analyzeAnalysisOptions(
         resourceProvider.getFile(path).createSource(),
         content,
@@ -304,7 +303,7 @@ class ContextManagerImpl implements ContextManager {
       var content = _readFile(path);
       var validator =
           ManifestValidator(resourceProvider.getFile(path).createSource());
-      var lineInfo = _computeLineInfo(content);
+      var lineInfo = LineInfo.fromContent(content);
       var errors = validator.validate(
           content, driver.analysisOptions.chromeOsManifestChecks);
       var converter = AnalyzerConverter();
@@ -331,7 +330,8 @@ class ContextManagerImpl implements ContextManager {
       parser.parse(content);
       var converter = AnalyzerConverter();
       convertedErrors = converter.convertAnalysisErrors(errorListener.errors,
-          lineInfo: _computeLineInfo(content), options: driver.analysisOptions);
+          lineInfo: LineInfo.fromContent(content),
+          options: driver.analysisOptions);
     } catch (exception) {
       // If the file cannot be analyzed, fall through to clear any previous
       // errors.
@@ -349,7 +349,7 @@ class ContextManagerImpl implements ContextManager {
       if (node is YamlMap) {
         var validator = PubspecValidator(
             resourceProvider, resourceProvider.getFile(path).createSource());
-        var lineInfo = _computeLineInfo(content);
+        var lineInfo = LineInfo.fromContent(content);
         var errors = validator.validate(node.nodes);
         var converter = AnalyzerConverter();
         convertedErrors = converter.convertAnalysisErrors(errors,
@@ -412,12 +412,6 @@ class ContextManagerImpl implements ContextManager {
     }
   }
 
-  /// Compute line information for the given [content].
-  LineInfo _computeLineInfo(String content) {
-    var lineStarts = StringUtilities.computeLineStarts(content);
-    return LineInfo(lineStarts);
-  }
-
   void _createAnalysisContexts() {
     _destroyAnalysisContexts();
     _fileContentCache.invalidateAll();

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

@@ -23,7 +23,6 @@ import 'package:analysis_server/src/services/correction/bulk_fix_processor.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/analysis_options/fix_generator.dart';
-import 'package:analysis_server/src/services/correction/fix/dart/top_level_declarations.dart';
 import 'package:analysis_server/src/services/correction/fix/manifest/fix_generator.dart';
 import 'package:analysis_server/src/services/correction/fix/pubspec/fix_generator.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
@@ -605,9 +604,7 @@ class EditDomainHandler extends AbstractRequestHandler {
           var workspace = DartChangeWorkspace(server.currentSessions);
           var context = DartFixContextImpl(
               server.instrumentationService, workspace, result, error,
-              (name) async {
-            return TopLevelDeclarations(result).withName(name);
-          }, extensionCache: server.getExtensionCacheFor(result));
+              extensionCache: server.getExtensionCacheFor(result));
 
           List<Fix> fixes;
           try {

pkg/analysis_server/lib/src/g3/fixes.dart

@@ -96,7 +96,6 @@ class LintFixTester {
       workspace,
       unitResult,
       error,
-      (name) async => const {},
     );
 
     List<Fix> fixes;

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

@@ -14,7 +14,6 @@ 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/dart/top_level_declarations.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -348,9 +347,7 @@ class CodeActionHandler extends MessageHandler<CodeActionParams,
         var workspace = DartChangeWorkspace(server.currentSessions);
         var context = DartFixContextImpl(
             server.instrumentationService, workspace, unit, error,
-            (name) async {
-          return TopLevelDeclarations(unit).withName(name);
-        }, extensionCache: server.getExtensionCacheFor(unit));
+            extensionCache: server.getExtensionCacheFor(unit));
         final fixes = await fixContributor.computeFixes(context);
         if (fixes.isNotEmpty) {
           final diagnostic = toDiagnostic(

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

@@ -220,7 +220,6 @@ class BulkFixProcessor {
           workspace,
           unit,
           error,
-          (name) async => {},
         );
         await _fixSingleError(fixContext, unit, error, overrideSet);
       }
@@ -266,7 +265,6 @@ class BulkFixProcessor {
         workspace,
         result,
         diagnostic,
-        (name) async => {},
       );
     }
 

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

@@ -4,6 +4,7 @@
 
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
 import 'package:analysis_server/src/services/completion/dart/extension_cache.dart';
+import 'package:analysis_server/src/services/correction/fix/dart/top_level_declarations.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -58,18 +59,15 @@ class DartFixContextImpl implements DartFixContext {
   @override
   final ExtensionCache extensionCache;
 
-  final Future<Map<LibraryElement, List<Element>>> Function(String name)
-      getTopLevelDeclarationsFunction;
-
   DartFixContextImpl(this.instrumentationService, this.workspace,
-      this.resolveResult, this.error, this.getTopLevelDeclarationsFunction,
+      this.resolveResult, this.error,
       {ExtensionCache? extensionCache})
       : extensionCache = extensionCache ?? ExtensionCache();
 
   @override
   Future<Map<LibraryElement, List<Element>>> getTopLevelDeclarations(
-      String name) {
-    return getTopLevelDeclarationsFunction(name);
+      String name) async {
+    return TopLevelDeclarations(resolveResult).withName(name);
   }
 }
 

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

@@ -251,7 +251,6 @@ class FixInFileProcessor {
             workspace,
             resolveResult,
             error,
-            (name) async => {},
             extensionCache: context.extensionCache,
           );
           fixState = await _fixError(fixContext, fixState, generator(), error);

pkg/analysis_server/test/src/services/correction/fix/fix_processor.dart

@@ -7,7 +7,6 @@ import 'package:analysis_server/src/services/completion/dart/extension_cache.dar
 import 'package:analysis_server/src/services/correction/bulk_fix_processor.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/dart/top_level_declarations.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/error/error.dart';
@@ -202,9 +201,6 @@ abstract class FixInFileProcessorTest extends BaseFixProcessorTest {
       workspace,
       testAnalysisResult,
       error,
-      (name) async {
-        return TopLevelDeclarations(testAnalysisResult).withName(name);
-      },
     );
 
     var fixes = await FixInFileProcessor(context).compute();
@@ -522,9 +518,6 @@ abstract class FixProcessorTest extends BaseFixProcessorTest {
       workspace,
       testAnalysisResult,
       error,
-      (name) async {
-        return TopLevelDeclarations(testAnalysisResult).withName(name);
-      },
       extensionCache: extensionCache,
     );
     return await DartFixContributor().computeFixes(context);

pkg/analysis_server/test/stress/replay/replay.dart

@@ -12,7 +12,6 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/error/listener.dart' as error;
 import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
-import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -497,7 +496,7 @@ class FileEdit {
       throw ArgumentError('Unhandled change of type ${record.status}');
     } else {
       content = File(filePath).readAsStringSync();
-      lineInfo = LineInfo(StringUtilities.computeLineStarts(content));
+      lineInfo = LineInfo.fromContent(content);
     }
     currentContent = content;
   }