[analysis_server] Switch some code from package:collection to Dart 3 APIs

- change forEachIndexed to `.indexed`
- remove `package:collection` imports for files only using `.firstOrNull`, `.singleOrNull`, `.lastOrNull` that is now available in `dart:core`
- switch from `Pair` to records
- use switch expressions

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

Author: DanTup

pkg/analysis_server/lib/src/computer/computer_folding.dart

@@ -7,7 +7,6 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
-import 'package:collection/collection.dart';
 
 /// A computer for [CompilationUnit] folding.
 class DartUnitFoldingComputer {

pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
-import 'package:collection/collection.dart';
 
 /// A lazy computer for Type Hierarchies.
 ///
@@ -156,7 +155,7 @@ class DartLazyTypeHierarchyComputer {
     ];
 
     if (anchor != null) {
-      supertypes.forEachIndexed((index, item) {
+      for (final (index, item) in supertypes.indexed) {
         // We only need to carry the anchor along if the supertype has type
         // arguments that we may be populating.
         if (item._type.typeArguments.isNotEmpty) {
@@ -165,7 +164,7 @@ class DartLazyTypeHierarchyComputer {
             path: [...anchor.path, index],
           );
         }
-      });
+      }
     }
 
     return supertypes;

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

@@ -47,7 +47,7 @@ class TextDocumentChangeHandler
         failureIsCritical: true);
     return newContents.mapResult((result) {
       server.documentVersions[path] = params.textDocument;
-      server.onOverlayUpdated(path, result.last, newContent: result.first);
+      server.onOverlayUpdated(path, result.edits, newContent: result.content);
       return success(null);
     });
   }

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

@@ -27,7 +27,6 @@ import 'package:analyzer/src/dart/analysis/search.dart' as server
     show DeclarationKind;
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
-import 'package:analyzer_plugin/utilities/pair.dart';
 import 'package:collection/collection.dart';
 
 const languageSourceName = 'dart';
@@ -638,20 +637,16 @@ lsp.DiagnosticRelatedInformation? pluginToDiagnosticRelatedInformation(
 
 lsp.DiagnosticSeverity pluginToDiagnosticSeverity(
     plugin.AnalysisErrorSeverity severity) {
-  switch (severity) {
-    case plugin.AnalysisErrorSeverity.ERROR:
-      return lsp.DiagnosticSeverity.Error;
-    case plugin.AnalysisErrorSeverity.WARNING:
-      return lsp.DiagnosticSeverity.Warning;
-    case plugin.AnalysisErrorSeverity.INFO:
-      return lsp.DiagnosticSeverity.Information;
+  return switch (severity) {
+    plugin.AnalysisErrorSeverity.ERROR => lsp.DiagnosticSeverity.Error,
+    plugin.AnalysisErrorSeverity.WARNING => lsp.DiagnosticSeverity.Warning,
+    plugin.AnalysisErrorSeverity.INFO => lsp.DiagnosticSeverity.Information,
     // Note: LSP also supports "Hint", but they won't render in things like the
     // VS Code errors list as they're apparently intended to communicate
     // non-visible diagnostics back (for example, if you wanted to grey out
     // unreachable code without producing an item in the error list).
-    default:
-      throw 'Unknown AnalysisErrorSeverity: $severity';
-  }
+    _ => throw 'Unknown AnalysisErrorSeverity: $severity'
+  };
 }
 
 /// Converts a numeric relevance to a sortable string.
@@ -965,8 +960,8 @@ lsp.CompletionItem toCompletionItem(
     selectionOffset: suggestion.selectionOffset,
     selectionLength: suggestion.selectionLength,
   );
-  final insertText = insertTextInfo.first;
-  final insertTextFormat = insertTextInfo.last;
+  final insertText = insertTextInfo.text;
+  final insertTextFormat = insertTextInfo.format;
   final isMultilineCompletion = insertText.contains('\n');
 
   final rawDoc = includeDocumentation == DocumentationPreference.full
@@ -1425,7 +1420,7 @@ lsp.MarkupContent _asMarkup(
   return lsp.MarkupContent(kind: format, value: content);
 }
 
-Pair<String, lsp.InsertTextFormat> _buildInsertText({
+({String text, lsp.InsertTextFormat format}) _buildInsertText({
   required bool supportsSnippets,
   required bool commitCharactersEnabled,
   required bool completeFunctionCalls,
@@ -1481,7 +1476,7 @@ Pair<String, lsp.InsertTextFormat> _buildInsertText({
     }
   }
 
-  return Pair(insertText, insertTextFormat);
+  return (text: insertText, format: insertTextFormat);
 }
 
 String _errorCode(server.ErrorCode code) => code.name.toLowerCase();

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

@@ -14,7 +14,6 @@ import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
-import 'package:analyzer_plugin/utilities/pair.dart';
 import 'package:dart_style/dart_style.dart';
 
 DartFormatter formatter = DartFormatter();
@@ -24,7 +23,8 @@ DartFormatter formatter = DartFormatter();
 ///
 /// Since the translation from line/characters to offsets needs to take previous
 /// changes into account, this will also apply the edits to [oldContent].
-ErrorOr<Pair<String, List<plugin.SourceEdit>>> applyAndConvertEditsToServer(
+ErrorOr<({String content, List<plugin.SourceEdit> edits})>
+    applyAndConvertEditsToServer(
   String oldContent,
   List<TextDocumentContentChangeEvent> changes, {
   bool failureIsCritical = false,
@@ -69,7 +69,7 @@ ErrorOr<Pair<String, List<plugin.SourceEdit>>> applyAndConvertEditsToServer(
       return ErrorOr.error(result.error);
     }
   }
-  return ErrorOr.success(Pair(newContent, serverEdits));
+  return ErrorOr.success((content: newContent, edits: serverEdits));
 }
 
 ErrorOr<List<TextEdit>?> generateEditsForFormatting(

pkg/analysis_server/lib/src/services/completion/dart/feature_computer.dart

@@ -25,7 +25,6 @@ import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/resolver/body_inference_context.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 const List<String> intNames = ['i', 'j', 'index', 'length'];
 const List<String> listNames = ['list', 'items'];

pkg/analysis_server/lib/src/services/completion/dart/fuzzy_filter_sort.dart

@@ -5,7 +5,6 @@
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
 import 'package:analysis_server/src/services/completion/filtering/fuzzy_matcher.dart';
-import 'package:collection/collection.dart';
 
 final _identifierPattern = RegExp(r'([_a-zA-Z][_a-zA-Z0-9]*)');
 

pkg/analysis_server/lib/src/services/completion/dart/super_formal_contributor.dart

@@ -6,7 +6,6 @@ import 'package:analysis_server/src/provisional/completion/dart/completion_dart.
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
-import 'package:collection/collection.dart';
 
 /// A contributor that produces suggestions for super formal parameters that
 /// are based on the parameters declared by the invoked super-constructor.

pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart

@@ -103,12 +103,12 @@ class TypeMemberContributor extends DartCompletionContributor {
     required RecordType type,
     required Set<String> excludedFields,
   }) {
-    type.positionalFields.forEachIndexed((index, field) {
+    for (final (index, field) in type.positionalFields.indexed) {
       builder.suggestRecordField(
         field: field,
         name: '\$${index + 1}',
       );
-    });
+    }
 
     for (final field in type.namedFields) {
       if (!excludedFields.contains(field.name)) {

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

@@ -8,7 +8,6 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
-import 'package:collection/collection.dart';
 
 class AddAwait extends CorrectionProducer {
   /// The kind of correction to be made.

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

@@ -12,7 +12,6 @@ import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
-import 'package:collection/collection.dart';
 
 class AddDiagnosticPropertyReference extends CorrectionProducer {
   @override

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

@@ -14,7 +14,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 /// A predicate is a one-argument function that returns a boolean value.
 typedef _ElementPredicate = bool Function(Element argument);

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

@@ -13,7 +13,6 @@ import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 class ConvertToSwitchExpression extends CorrectionProducer {
   /// Local variable reference used in assignment switch expression generation.

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

@@ -16,7 +16,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 class FlutterConvertToStatelessWidget extends CorrectionProducer {
   @override

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

@@ -13,7 +13,6 @@ import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 class FlutterRemoveWidget extends CorrectionProducer {
   @override

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

@@ -12,7 +12,6 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 
 class MoveDocCommentToLibraryDirective extends CorrectionProducer {
   @override

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

@@ -14,7 +14,6 @@ import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/ignore_comments/ignore_info.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart'
     hide AnalysisError, Element;
-import 'package:collection/collection.dart';
 import 'package:meta/meta_meta.dart';
 
 /// Organizer of imports (and other directives) in the [unit].

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

@@ -28,7 +28,6 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart'
     show SourceChange, SourceEdit;
 import 'package:analyzer_plugin/src/utilities/string_utilities.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
-import 'package:collection/collection.dart';
 import 'package:path/path.dart' as path;
 
 /// Adds edits to the given [change] that ensure that all the [libraries] are

pkg/analysis_server/test/lsp/pub_package_service_test.dart

@@ -10,7 +10,6 @@ import 'package:analysis_server/src/services/pub/pub_command.dart';
 import 'package:analysis_server/src/services/pub/pub_package_service.dart';
 import 'package:analyzer/instrumentation/service.dart';
 import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
-import 'package:collection/collection.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
@@ -252,13 +251,13 @@ class PubCommandTest with ResourceProviderMixin {
         (executable, args, {dir, env}) => MockProcess(1, 0, validJson, '');
     final result = await pubCommand.outdatedVersions(pubspecPath);
     expect(result, hasLength(2));
-    result.forEachIndexed((index, package) {
+    for (final (index, package) in result.indexed) {
       expect(package.packageName, equals(index == 0 ? 'foo' : 'bar'));
       expect(package.currentVersion, equals('1.0.0'));
       expect(package.upgradableVersion, equals('2.0.0'));
       expect(package.resolvableVersion, equals('3.0.0'));
       expect(package.latestVersion, equals('4.0.0'));
-    });
+    }
   }
 }
 

pkg/analysis_server/test/lsp/type_hierarchy_test.dart

@@ -4,7 +4,6 @@
 
 import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
 import 'package:analyzer/src/test_utilities/test_code_format.dart';
-import 'package:collection/collection.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 

pkg/analysis_server/test/src/computer/color_computer_test.dart

@@ -5,7 +5,6 @@
 import 'package:analysis_server/src/computer/computer_color.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
-import 'package:collection/collection.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -148,7 +147,7 @@ class ColorComputerTest extends AbstractContextTest {
           '$dartCode',
     );
 
-    expectedColorValues.entries.forEachIndexed((i, expectedColor) {
+    for (final (i, expectedColor) in expectedColorValues.entries.indexed) {
       final color = colors[i];
       final expectedColorCode = expectedColor.key;
       final expectedColorValue = expectedColor.value;
@@ -175,7 +174,7 @@ class ColorComputerTest extends AbstractContextTest {
       expectComponent(color.color.red, expectedRed, 'Red');
       expectComponent(color.color.green, expectedGreen, 'Green');
       expectComponent(color.color.blue, expectedBlue, 'Blue');
-    });
+    }
   }
 
   void expectNoErrors(ResolvedUnitResult result) {