Migrate more completion support

Change-Id: I073972400bb79166a836e517e268452a03b64f52
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/195040
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

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

@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/completion_performance.dart';
@@ -35,7 +33,7 @@ class CiderCompletionComputer {
   final OperationPerformanceImpl _performanceRoot =
       OperationPerformanceImpl('<root>');
 
-  DartCompletionRequestImpl _dartCompletionRequest;
+  late DartCompletionRequestImpl _dartCompletionRequest;
 
   /// Paths of imported libraries for which suggestions were (re)computed
   /// during processing of this request. Does not include libraries that were
@@ -53,10 +51,10 @@ class CiderCompletionComputer {
   ///
   /// The [line] and [column] are zero based.
   Future<CiderCompletionResult> compute({
-    @required String path,
-    @required int line,
-    @required int column,
-    @visibleForTesting void Function(ResolvedUnitResult) testResolvedUnit,
+    required String path,
+    required int line,
+    required int column,
+    @visibleForTesting void Function(ResolvedUnitResult)? testResolvedUnit,
   }) async {
     return _performanceRoot.runAsync('completion', (performance) async {
       var resolvedUnit = performance.run('resolution', (performance) {
@@ -147,9 +145,9 @@ class CiderCompletionComputer {
         suggestions: suggestions,
         performance: CiderCompletionPerformance._(
           file: Duration.zero,
-          imports: performance.getChild('imports').elapsed,
-          resolution: performance.getChild('resolution').elapsed,
-          suggestions: performance.getChild('suggestions').elapsed,
+          imports: performance.getChild('imports')!.elapsed,
+          resolution: performance.getChild('resolution')!.elapsed,
+          suggestions: performance.getChild('suggestions')!.elapsed,
           operations: _performanceRoot.children.first,
         ),
         prefixStart: CiderPosition(line, column - filter._pattern.length),
@@ -161,9 +159,9 @@ class CiderCompletionComputer {
 
   @Deprecated('Use compute')
   Future<CiderCompletionResult> compute2({
-    @required String path,
-    @required int line,
-    @required int column,
+    required String path,
+    required int line,
+    required int column,
   }) async {
     return compute(path: path, line: line, column: column);
   }
@@ -184,8 +182,8 @@ class CiderCompletionComputer {
   /// TODO(scheglov) Implement show / hide combinators.
   /// TODO(scheglov) Implement prefixes.
   List<CompletionSuggestion> _importedLibrariesSuggestions({
-    @required LibraryElement target,
-    @required OperationPerformanceImpl performance,
+    required LibraryElement target,
+    required OperationPerformanceImpl performance,
   }) {
     var suggestions = <CompletionSuggestion>[];
     for (var importedLibrary in target.importedLibraries) {
@@ -202,8 +200,8 @@ class CiderCompletionComputer {
   /// Return cached, or compute unprefixed suggestions for all elements
   /// exported from the library.
   List<CompletionSuggestion> _importedLibrarySuggestions({
-    @required LibraryElement element,
-    @required OperationPerformanceImpl performance,
+    required LibraryElement element,
+    required OperationPerformanceImpl performance,
   }) {
     performance.getDataInt('libraryCount').increment();
 
@@ -262,11 +260,11 @@ class CiderCompletionPerformance {
   final OperationPerformance operations;
 
   CiderCompletionPerformance._({
-    @required this.file,
-    @required this.imports,
-    @required this.resolution,
-    @required this.suggestions,
-    @required this.operations,
+    required this.file,
+    required this.imports,
+    required this.resolution,
+    required this.suggestions,
+    required this.operations,
   });
 }
 
@@ -281,9 +279,9 @@ class CiderCompletionResult {
   final CiderPosition prefixStart;
 
   CiderCompletionResult._({
-    @required this.suggestions,
-    @required this.performance,
-    @required this.prefixStart,
+    required this.suggestions,
+    required this.performance,
+    required this.prefixStart,
   });
 }
 
@@ -305,8 +303,8 @@ class _FilterSort {
   final DartCompletionRequestImpl _request;
   final List<CompletionSuggestion> _suggestions;
 
-  FuzzyMatcher _matcher;
-  String _pattern;
+  late FuzzyMatcher _matcher;
+  late String _pattern;
 
   _FilterSort(this._request, this._suggestions);
 

pkg/analysis_server/lib/src/domains/execution/completion.dart

@@ -2,18 +2,11 @@
 // 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.
 
-// @dart = 2.9
-
 import 'package:analysis_server/src/protocol_server.dart'
-    show
-        CompletionSuggestion,
-        RuntimeCompletionExpression,
-        RuntimeCompletionVariable,
-        SourceEdit;
+    show CompletionSuggestion, RuntimeCompletionExpression, SourceEdit;
 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/completion_manager.dart';
-import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/file_system/overlay_file_system.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
@@ -28,18 +21,8 @@ class RuntimeCompletionComputer {
   final String contextPath;
   final int contextOffset;
 
-  final List<RuntimeCompletionVariable> variables;
-  final List<RuntimeCompletionExpression> expressions;
-
-  RuntimeCompletionComputer(
-      this.resourceProvider,
-      this.analysisDriver,
-      this.code,
-      this.offset,
-      this.contextPath,
-      this.contextOffset,
-      this.variables,
-      this.expressions);
+  RuntimeCompletionComputer(this.resourceProvider, this.analysisDriver,
+      this.code, this.offset, this.contextPath, this.contextOffset);
 
   Future<RuntimeCompletionResult> compute() async {
     var contextResult = await analysisDriver.getResult(contextPath);
@@ -65,7 +48,7 @@ class RuntimeCompletionComputer {
 
     // Compute the patched context file content.
     var targetCode = SourceEdit.applySequence(
-      contextResult.content,
+      contextResult.content!,
       changeBuilder.sourceChange.edits[0].edits,
     );
 
@@ -75,9 +58,8 @@ class RuntimeCompletionComputer {
 
     // Update the context file content to include the code being completed.
     // Then resolve it, and restore the file to its initial state.
-    ResolvedUnitResult targetResult;
-    await _withContextFileContent(targetCode, () async {
-      targetResult = await analysisDriver.getResult(contextPath);
+    var targetResult = await _withContextFileContent(targetCode, () async {
+      return await analysisDriver.getResult(contextPath);
     });
 
     var contributor = DartCompletionManager(
@@ -106,8 +88,8 @@ class RuntimeCompletionComputer {
     return RuntimeCompletionResult(expressions, suggestions);
   }
 
-  Future<void> _withContextFileContent(
-      String newContent, Future<void> Function() f) async {
+  Future<R> _withContextFileContent<R>(
+      String newContent, Future<R> Function() f) async {
     if (resourceProvider.hasOverlay(contextPath)) {
       var contextFile = resourceProvider.getFile(contextPath);
       var prevOverlayContent = contextFile.readAsStringSync();
@@ -119,7 +101,7 @@ class RuntimeCompletionComputer {
           modificationStamp: 0,
         );
         analysisDriver.changeFile(contextPath);
-        await f();
+        return await f();
       } finally {
         resourceProvider.setOverlay(
           contextPath,
@@ -136,7 +118,7 @@ class RuntimeCompletionComputer {
           modificationStamp: 0,
         );
         analysisDriver.changeFile(contextPath);
-        await f();
+        return await f();
       } finally {
         resourceProvider.removeOverlay(contextPath);
         analysisDriver.changeFile(contextPath);

pkg/analysis_server/test/services/completion/postfix/test_all.dart

@@ -2,8 +2,6 @@
 // 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.
 
-// @dart = 2.9
-
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'postfix_completion_test.dart' as postfix_completion_test;