[DAS] "Update library import" edit hide

[email protected]

Fixes #30503

Change-Id: I2d16e18a3644333f57f77c1b2ead86c8734c2cd4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390630
Auto-Submit: Felipe Morschel <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: FMorschel

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

@@ -101,10 +101,14 @@ class ImportLibrary extends MultiCorrectionProducer {
         if (combinators.length == 1) {
           var combinator = combinators[0];
           if (combinator is HideElementCombinator) {
-            // TODO(brianwilkerson): Support removing the extension name from a
-            //  hide combinator.
+            producers.add(_ImportLibraryCombinator(
+              libraryToImport.source.uri.toString(),
+              combinator,
+              instantiatedExtension.extension.name!,
+              context: context,
+            ));
           } else if (combinator is ShowElementCombinator) {
-            producers.add(_ImportLibraryShow(
+            producers.add(_ImportLibraryCombinator(
               libraryToImport.source.uri.toString(),
               combinator,
               instantiatedExtension.extension.name!,
@@ -197,23 +201,25 @@ class ImportLibrary extends MultiCorrectionProducer {
             _ImportLibraryPrefix(libraryElement, prefix, context: context));
         continue;
       }
-      // Maybe update a "show" directive.
+      // Maybe update a "show"/"hide" directive.
       var combinators = import.combinators;
       if (combinators.length == 1) {
-        var combinator = combinators[0];
+        // Prepare library name - unit name or 'dart:name' for SDK library.
+        var libraryName =
+            libraryElement.definingCompilationUnit.source.uri.toString();
+        if (libraryElement.isInSdk) {
+          libraryName = libraryElement.source.shortName;
+        }
+        var combinator = combinators.first;
         if (combinator is HideElementCombinator) {
-          // TODO(brianwilkerson): Support removing the element name from a
-          //  hide combinator.
+          // Don't add this library again.
+          alreadyImportedWithPrefix.add(libraryElement);
+          producers.add(_ImportLibraryCombinator(libraryName, combinator, name,
+              context: context));
         } else if (combinator is ShowElementCombinator) {
-          // Prepare library name - unit name or 'dart:name' for SDK library.
-          var libraryName =
-              libraryElement.definingCompilationUnit.source.uri.toString();
-          if (libraryElement.isInSdk) {
-            libraryName = libraryElement.source.shortName;
-          }
           // Don't add this library again.
           alreadyImportedWithPrefix.add(libraryElement);
-          producers.add(_ImportLibraryShow(libraryName, combinator, name,
+          producers.add(_ImportLibraryCombinator(libraryName, combinator, name,
               context: context));
         }
       }
@@ -447,6 +453,66 @@ enum _ImportKind {
   forType
 }
 
+/// A correction processor that can add/remove a name to/from the show/hide
+/// combinator of an existing import.
+class _ImportLibraryCombinator extends ResolvedCorrectionProducer {
+  final String _libraryName;
+
+  final NamespaceCombinator _combinator;
+
+  final String _updatedName;
+
+  _ImportLibraryCombinator(
+    this._libraryName,
+    this._combinator,
+    this._updatedName, {
+    required super.context,
+  });
+
+  @override
+  CorrectionApplicability get applicability =>
+      // TODO(applicability): comment on why.
+      CorrectionApplicability.singleLocation;
+
+  @override
+  List<String> get fixArguments => [_libraryName];
+
+  @override
+  FixKind get fixKind => DartFixKind.IMPORT_LIBRARY_COMBINATOR;
+
+  @override
+  Future<void> compute(ChangeBuilder builder) async {
+    Set<String> finalNames = SplayTreeSet<String>();
+    int offset;
+    int length;
+    Keyword keyword;
+    if (_combinator case ShowElementCombinator(shownNames: var names)) {
+      finalNames.addAll(names);
+      offset = _combinator.offset;
+      length = _combinator.end - offset;
+      finalNames.add(_updatedName);
+      keyword = Keyword.SHOW;
+    } else if (_combinator case HideElementCombinator(hiddenNames: var names)) {
+      finalNames.addAll(names);
+      offset = _combinator.offset;
+      length = _combinator.end - offset;
+      finalNames.remove(_updatedName);
+      keyword = Keyword.HIDE;
+    } else {
+      return;
+    }
+    var newCombinatorCode = '';
+    if (finalNames.isNotEmpty) {
+      newCombinatorCode = ' ${keyword.lexeme} ${finalNames.join(', ')}';
+    }
+    var libraryFile = unitResult.libraryElement.source.fullName;
+    await builder.addDartFileEdit(libraryFile, (builder) {
+      builder.addSimpleReplacement(
+          SourceRange(offset - 1, length + 1), newCombinatorCode);
+    });
+  }
+}
+
 /// A correction processor that can add an import of a library containing an
 /// extension, but which does so only if the extension applies to a given type.
 class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
@@ -535,48 +601,6 @@ class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
   }
 }
 
-/// A correction processor that can add a name to the show combinator of an
-/// existing import.
-class _ImportLibraryShow extends ResolvedCorrectionProducer {
-  final String _libraryName;
-
-  final ShowElementCombinator _showCombinator;
-
-  final String _addedName;
-
-  _ImportLibraryShow(
-    this._libraryName,
-    this._showCombinator,
-    this._addedName, {
-    required super.context,
-  });
-
-  @override
-  CorrectionApplicability get applicability =>
-      // TODO(applicability): comment on why.
-      CorrectionApplicability.singleLocation;
-
-  @override
-  List<String> get fixArguments => [_libraryName];
-
-  @override
-  FixKind get fixKind => DartFixKind.IMPORT_LIBRARY_SHOW;
-
-  @override
-  Future<void> compute(ChangeBuilder builder) async {
-    Set<String> showNames = SplayTreeSet<String>();
-    showNames.addAll(_showCombinator.shownNames);
-    showNames.add(_addedName);
-    var newShowCode = 'show ${showNames.join(', ')}';
-    var offset = _showCombinator.offset;
-    var length = _showCombinator.end - offset;
-    var libraryFile = unitResult.libraryElement.source.fullName;
-    await builder.addDartFileEdit(libraryFile, (builder) {
-      builder.addSimpleReplacement(SourceRange(offset, length), newShowCode);
-    });
-  }
-}
-
 /// A correction processor that can add an import using a relative URI.
 class _ImportRelativeLibrary extends ResolvedCorrectionProducer {
   final FixKind _fixKind;

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

@@ -819,6 +819,11 @@ abstract final class DartFixKind {
     49,
     "Import 'dart:async'",
   );
+  static const IMPORT_LIBRARY_COMBINATOR = FixKind(
+    'dart.fix.import.libraryCombinator',
+    DartFixKindPriority.standard + 5,
+    "Update library '{0}' import",
+  );
   static const IMPORT_LIBRARY_PREFIX = FixKind(
     'dart.fix.import.libraryPrefix',
     DartFixKindPriority.standard + 5,
@@ -844,11 +849,6 @@ abstract final class DartFixKind {
     DartFixKindPriority.standard + 4,
     "Import library '{0}'",
   );
-  static const IMPORT_LIBRARY_SHOW = FixKind(
-    'dart.fix.import.libraryShow',
-    DartFixKindPriority.standard + 5,
-    "Update library '{0}' import",
-  );
   static const INLINE_INVOCATION = FixKind(
     'dart.fix.inlineInvocation',
     DartFixKindPriority.standard - 20,