Analysis server: Remove unnecessary imports; standardize on prefix use

In a few files, an element is available twice: once without a prefix,
and once with a prefix, and the element is referenced in both ways. This
triggers an "unnecessary import" diagnostic, and changing all of the
references to be unified resolves the issue.

Bug: #44569
Change-Id: I3c5a3f397f0a3603624a2d23becfda2753cc9f8a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/177280
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -11,7 +11,6 @@ import 'package:analysis_server/lsp_protocol/protocol_generated.dart' as lsp;
 import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
 import 'package:analysis_server/lsp_protocol/protocol_special.dart';
 import 'package:analysis_server/lsp_protocol/protocol_special.dart' as lsp;
-import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/lsp/constants.dart' as lsp;
 import 'package:analysis_server/src/lsp/constants.dart';
 import 'package:analysis_server/src/lsp/dartdoc.dart';
@@ -212,7 +211,7 @@ lsp.CompletionItem declarationToCompletionItem(
   HashSet<lsp.CompletionItemKind> supportedCompletionItemKinds,
   String file,
   int offset,
-  IncludedSuggestionSet includedSuggestionSet,
+  server.IncludedSuggestionSet includedSuggestionSet,
   Library library,
   Map<String, int> tagBoosts,
   server.LineInfo lineInfo,
@@ -667,7 +666,7 @@ lsp.Diagnostic pluginToDiagnostic(
   server.LineInfo Function(String) getLineInfo,
   plugin.AnalysisError error,
 ) {
-  List<DiagnosticRelatedInformation> relatedInformation;
+  List<lsp.DiagnosticRelatedInformation> relatedInformation;
   if (error.contextMessages != null && error.contextMessages.isNotEmpty) {
     relatedInformation = error.contextMessages
         .map((message) =>
@@ -792,18 +791,20 @@ lsp.ClosingLabel toClosingLabel(
         range: toRange(lineInfo, label.offset, label.length),
         label: label.label);
 
-CodeActionKind toCodeActionKind(String id, lsp.CodeActionKind fallback) {
+lsp.CodeActionKind toCodeActionKind(String id, lsp.CodeActionKind fallback) {
   if (id == null) {
     return fallback;
   }
   // Dart fixes and assists start with "dart.assist." and "dart.fix." but in LSP
   // we want to use the predefined prefixes for CodeActions.
   final newId = id
-      .replaceAll('dart.assist', CodeActionKind.Refactor.toString())
-      .replaceAll('dart.fix', CodeActionKind.QuickFix.toString())
-      .replaceAll('analysisOptions.assist', CodeActionKind.Refactor.toString())
-      .replaceAll('analysisOptions.fix', CodeActionKind.QuickFix.toString());
-  return CodeActionKind(newId);
+      .replaceAll('dart.assist', lsp.CodeActionKind.Refactor.toString())
+      .replaceAll('dart.fix', lsp.CodeActionKind.QuickFix.toString())
+      .replaceAll(
+          'analysisOptions.assist', lsp.CodeActionKind.Refactor.toString())
+      .replaceAll(
+          'analysisOptions.fix', lsp.CodeActionKind.QuickFix.toString());
+  return lsp.CodeActionKind(newId);
 }
 
 lsp.CompletionItem toCompletionItem(
@@ -931,7 +932,7 @@ lsp.Diagnostic toDiagnostic(
   // Default to the error's severity if none is specified.
   errorSeverity ??= errorCode.errorSeverity;
 
-  List<DiagnosticRelatedInformation> relatedInformation;
+  List<lsp.DiagnosticRelatedInformation> relatedInformation;
   if (error.contextMessages.isNotEmpty) {
     relatedInformation = error.contextMessages
         .map((message) => toDiagnosticRelatedInformation(result, message))
@@ -1232,7 +1233,7 @@ lsp.TextDocumentEdit toTextDocumentEdit(FileEditInformation edit) {
   return lsp.TextDocumentEdit(
     textDocument: edit.doc,
     edits: edit.edits
-        .map((e) => Either2<TextEdit, AnnotatedTextEdit>.t1(
+        .map((e) => Either2<lsp.TextEdit, lsp.AnnotatedTextEdit>.t1(
             toTextEdit(edit.lineInfo, e)))
         .toList(),
   );

pkg/analysis_server/test/analysis/update_content_test.dart

@@ -6,7 +6,6 @@ import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_constants.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -235,8 +234,8 @@ f() {}
     var files = params.files;
     expect(files, hasLength(1));
     Object overlay = files[filePath];
-    expect(overlay, const TypeMatcher<plugin.AddContentOverlay>());
-    plugin.AddContentOverlay addOverlay = overlay;
+    expect(overlay, const TypeMatcher<AddContentOverlay>());
+    AddContentOverlay addOverlay = overlay;
     expect(addOverlay.content, fileContent);
     //
     // Change
@@ -251,8 +250,8 @@ f() {}
     files = params.files;
     expect(files, hasLength(1));
     overlay = files[filePath];
-    expect(overlay, const TypeMatcher<plugin.ChangeContentOverlay>());
-    plugin.ChangeContentOverlay changeOverlay = overlay;
+    expect(overlay, const TypeMatcher<ChangeContentOverlay>());
+    ChangeContentOverlay changeOverlay = overlay;
     expect(changeOverlay.edits, hasLength(2));
     //
     // Remove
@@ -265,7 +264,7 @@ f() {}
     files = params.files;
     expect(files, hasLength(1));
     overlay = files[filePath];
-    expect(overlay, const TypeMatcher<plugin.RemoveContentOverlay>());
+    expect(overlay, const TypeMatcher<RemoveContentOverlay>());
   }
 
 //  CompilationUnit _getTestUnit() {