[analyzer] Move 4 more HintCodes to be WarningCodes, UNUSED_*

Bug: #50796
Change-Id: Ib5b153bc6e64bc433df1f05c53d82f71b470bbec
TEST=presubmit bots
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/290703
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Alexander Aprelev <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Nate Bosch <[email protected]>

Author: srawlins

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

@@ -383,7 +383,7 @@ class BulkFixProcessor {
           }
         } else if (errorCode == WarningCode.DUPLICATE_IMPORT ||
             errorCode == HintCode.UNNECESSARY_IMPORT ||
-            errorCode == HintCode.UNUSED_IMPORT) {
+            errorCode == WarningCode.UNUSED_IMPORT) {
           unusedImportErrors.add(error);
         }
       }

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -1441,14 +1441,6 @@ HintCode.UNUSED_ELEMENT:
   status: hasFix
 HintCode.UNUSED_ELEMENT_PARAMETER:
   status: hasFix
-HintCode.UNUSED_FIELD:
-  status: hasFix
-HintCode.UNUSED_IMPORT:
-  status: hasFix
-HintCode.UNUSED_LOCAL_VARIABLE:
-  status: hasFix
-HintCode.UNUSED_SHOWN_NAME:
-  status: hasFix
 LanguageCode.IMPLICIT_DYNAMIC_FIELD:
   status: needsFix
   notes: |-
@@ -2869,8 +2861,14 @@ WarningCode.UNUSED_CATCH_CLAUSE:
   status: hasFix
 WarningCode.UNUSED_CATCH_STACK:
   status: hasFix
+WarningCode.UNUSED_FIELD:
+  status: hasFix
+WarningCode.UNUSED_IMPORT:
+  status: hasFix
 WarningCode.UNUSED_LABEL:
   status: hasFix
+WarningCode.UNUSED_LOCAL_VARIABLE:
+  status: hasFix
 WarningCode.UNUSED_RESULT:
   status: noFix
   notes: |-
@@ -2879,3 +2877,5 @@ WarningCode.UNUSED_RESULT_WITH_MESSAGE:
   status: noFix
   notes: |-
     There is no predictable common way in which a result _should_ be used.
+WarningCode.UNUSED_SHOWN_NAME:
+  status: hasFix

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

@@ -1386,18 +1386,6 @@ class FixProcessor extends BaseProcessor {
     HintCode.UNUSED_ELEMENT_PARAMETER: [
       RemoveUnusedParameter.new,
     ],
-    HintCode.UNUSED_FIELD: [
-      RemoveUnusedField.new,
-    ],
-    HintCode.UNUSED_IMPORT: [
-      RemoveUnusedImport.new,
-    ],
-    HintCode.UNUSED_LOCAL_VARIABLE: [
-      RemoveUnusedLocalVariable.new,
-    ],
-    HintCode.UNUSED_SHOWN_NAME: [
-      RemoveNameFromCombinator.new,
-    ],
     ParserErrorCode.ABSTRACT_CLASS_MEMBER: [
       RemoveAbstract.bulkFixable,
     ],
@@ -1640,9 +1628,21 @@ class FixProcessor extends BaseProcessor {
     WarningCode.UNUSED_CATCH_STACK: [
       RemoveUnusedCatchStack.new,
     ],
+    WarningCode.UNUSED_FIELD: [
+      RemoveUnusedField.new,
+    ],
+    WarningCode.UNUSED_IMPORT: [
+      RemoveUnusedImport.new,
+    ],
     WarningCode.UNUSED_LABEL: [
       RemoveUnusedLabel.new,
     ],
+    WarningCode.UNUSED_LOCAL_VARIABLE: [
+      RemoveUnusedLocalVariable.new,
+    ],
+    WarningCode.UNUSED_SHOWN_NAME: [
+      RemoveNameFromCombinator.new,
+    ],
   };
 
   final DartFixContext fixContext;

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

@@ -59,7 +59,7 @@ class ImportOrganizer {
   bool _isUnusedImport(UriBasedDirective directive) {
     for (var error in errors) {
       if ((error.errorCode == WarningCode.DUPLICATE_IMPORT ||
-              error.errorCode == HintCode.UNUSED_IMPORT ||
+              error.errorCode == WarningCode.UNUSED_IMPORT ||
               error.errorCode == HintCode.UNNECESSARY_IMPORT) &&
           directive.uri.offset == error.offset) {
         return true;

pkg/analysis_server/test/abstract_single_unit.dart

@@ -75,9 +75,9 @@ class AbstractSingleUnitTest extends AbstractContextTest {
             error.errorCode != WarningCode.UNUSED_CATCH_CLAUSE &&
             error.errorCode != WarningCode.UNUSED_CATCH_STACK &&
             error.errorCode != HintCode.UNUSED_ELEMENT &&
-            error.errorCode != HintCode.UNUSED_FIELD &&
-            error.errorCode != HintCode.UNUSED_IMPORT &&
-            error.errorCode != HintCode.UNUSED_LOCAL_VARIABLE;
+            error.errorCode != WarningCode.UNUSED_FIELD &&
+            error.errorCode != WarningCode.UNUSED_IMPORT &&
+            error.errorCode != WarningCode.UNUSED_LOCAL_VARIABLE;
       }), isEmpty);
     }
     testUnitElement = testUnit.declaredElement!;

pkg/analysis_server/test/src/services/correction/fix/data_driven/data_driven_test_support.dart

@@ -9,7 +9,7 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/transfor
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/transform_set_manager.dart';
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/src/dart/error/hint_codes.dart';
+import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 
 import '../fix_processor.dart';
@@ -46,7 +46,7 @@ abstract class DataDrivenFixProcessorTest extends FixProcessorTest {
   /// A method that can be used as an error filter to ignore any unused_import
   /// diagnostics.
   bool ignoreUnusedImport(AnalysisError error) =>
-      error.errorCode != HintCode.UNUSED_IMPORT;
+      error.errorCode != WarningCode.UNUSED_IMPORT;
 
   /// Set the content of the library that defines the element referenced by the
   /// data on which this test is based.

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

@@ -94,7 +94,7 @@ import 'dart:math';
 import 'dart:async';
 void f() {}
 ''');
-    await assertHasFixAllFix(HintCode.UNUSED_IMPORT, '''
+    await assertHasFixAllFix(WarningCode.UNUSED_IMPORT, '''
 void f() {}
 ''');
   }
@@ -109,7 +109,7 @@ var tau = math.pi * 2;
 
 void f() {}
 ''');
-    await assertHasFixAllFix(HintCode.UNUSED_IMPORT, '''
+    await assertHasFixAllFix(WarningCode.UNUSED_IMPORT, '''
 import 'dart:math' as math;
 
 var tau = math.pi * 2;
@@ -126,7 +126,7 @@ void f() {}
 import 'dart:math'; import 'dart:math'; import 'dart:math';
 void f() {}
 ''');
-    await assertHasFixAllFix(HintCode.UNUSED_IMPORT, '''
+    await assertHasFixAllFix(WarningCode.UNUSED_IMPORT, '''
 
 void f() {}
 ''');
@@ -137,7 +137,7 @@ void f() {}
 import 'dart:math'; import 'dart:math'; import 'dart:math';
 void f() {}
 ''');
-    await assertHasFixAllFix(HintCode.UNUSED_IMPORT, '''
+    await assertHasFixAllFix(WarningCode.UNUSED_IMPORT, '''
 import 'dart:math';
 void f() {}
 ''');
@@ -150,7 +150,7 @@ import 'dart:math';
 import 'dart:math';
 void f() {}
 ''');
-    await assertHasFixAllFix(HintCode.UNUSED_IMPORT, '''
+    await assertHasFixAllFix(WarningCode.UNUSED_IMPORT, '''
 void f() {}
 ''');
   }

pkg/analyzer/lib/src/dart/error/hint_codes.g.dart

@@ -13,6 +13,7 @@
 
 import "package:analyzer/error/error.dart";
 import "package:analyzer/src/error/analyzer_error_code.dart";
+import "package:analyzer/src/error/codes.g.dart";
 
 class HintCode extends AnalyzerErrorCode {
   ///  When the target expression uses '?.' operator, it can be `null`, so all the
@@ -210,41 +211,9 @@ class HintCode extends AnalyzerErrorCode {
     uniqueName: 'UNUSED_ELEMENT_PARAMETER',
   );
 
-  ///  Parameters:
-  ///  0: the name of the unused field
-  static const HintCode UNUSED_FIELD = HintCode(
-    'UNUSED_FIELD',
-    "The value of the field '{0}' isn't used.",
-    correctionMessage: "Try removing the field, or using it.",
-    hasPublishedDocs: true,
-  );
-
-  ///  Parameters:
-  ///  0: the content of the unused import's URI
-  static const HintCode UNUSED_IMPORT = HintCode(
-    'UNUSED_IMPORT',
-    "Unused import: '{0}'.",
-    correctionMessage: "Try removing the import directive.",
-    hasPublishedDocs: true,
-  );
-
-  ///  Parameters:
-  ///  0: the name of the unused variable
-  static const HintCode UNUSED_LOCAL_VARIABLE = HintCode(
-    'UNUSED_LOCAL_VARIABLE',
-    "The value of the local variable '{0}' isn't used.",
-    correctionMessage: "Try removing the variable or using it.",
-    hasPublishedDocs: true,
-  );
-
-  ///  Parameters:
-  ///  0: the name that is shown but not used
-  static const HintCode UNUSED_SHOWN_NAME = HintCode(
-    'UNUSED_SHOWN_NAME',
-    "The name {0} is shown, but isn't used.",
-    correctionMessage: "Try removing the name from the list of shown members.",
-    hasPublishedDocs: true,
-  );
+  ///  This is the deprecated alias for [WarningCode.UNUSED_LOCAL_VARIABLE].
+  static const WarningCode UNUSED_LOCAL_VARIABLE =
+      WarningCode.UNUSED_LOCAL_VARIABLE;
 
   /// Initialize a newly created error code to have the given [name].
   const HintCode(

pkg/analyzer/lib/src/error/codes.g.dart

@@ -7151,11 +7151,23 @@ class WarningCode extends AnalyzerErrorCode {
   static const HintCode UNUSED_ELEMENT_PARAMETER =
       HintCode.UNUSED_ELEMENT_PARAMETER;
 
-  ///  This is the new replacement for [HintCode.UNUSED_FIELD].
-  static const HintCode UNUSED_FIELD = HintCode.UNUSED_FIELD;
+  ///  Parameters:
+  ///  0: the name of the unused field
+  static const WarningCode UNUSED_FIELD = WarningCode(
+    'UNUSED_FIELD',
+    "The value of the field '{0}' isn't used.",
+    correctionMessage: "Try removing the field, or using it.",
+    hasPublishedDocs: true,
+  );
 
-  ///  This is the new replacement for [HintCode.UNUSED_IMPORT].
-  static const HintCode UNUSED_IMPORT = HintCode.UNUSED_IMPORT;
+  ///  Parameters:
+  ///  0: the content of the unused import's URI
+  static const WarningCode UNUSED_IMPORT = WarningCode(
+    'UNUSED_IMPORT',
+    "Unused import: '{0}'.",
+    correctionMessage: "Try removing the import directive.",
+    hasPublishedDocs: true,
+  );
 
   ///  Parameters:
   ///  0: the label that isn't used
@@ -7168,8 +7180,14 @@ class WarningCode extends AnalyzerErrorCode {
     hasPublishedDocs: true,
   );
 
-  ///  This is the new replacement for [HintCode.UNUSED_LOCAL_VARIABLE].
-  static const HintCode UNUSED_LOCAL_VARIABLE = HintCode.UNUSED_LOCAL_VARIABLE;
+  ///  Parameters:
+  ///  0: the name of the unused variable
+  static const WarningCode UNUSED_LOCAL_VARIABLE = WarningCode(
+    'UNUSED_LOCAL_VARIABLE',
+    "The value of the local variable '{0}' isn't used.",
+    correctionMessage: "Try removing the variable or using it.",
+    hasPublishedDocs: true,
+  );
 
   ///  Parameters:
   ///  0: the name of the annotated method, property or function
@@ -7199,6 +7217,15 @@ class WarningCode extends AnalyzerErrorCode {
     uniqueName: 'UNUSED_RESULT_WITH_MESSAGE',
   );
 
+  ///  Parameters:
+  ///  0: the name that is shown but not used
+  static const WarningCode UNUSED_SHOWN_NAME = WarningCode(
+    'UNUSED_SHOWN_NAME',
+    "The name {0} is shown, but isn't used.",
+    correctionMessage: "Try removing the name from the list of shown members.",
+    hasPublishedDocs: true,
+  );
+
   /// Initialize a newly created error code to have the given [name].
   const WarningCode(
     String name,

pkg/analyzer/lib/src/error/error_code_values.g.dart

@@ -601,10 +601,6 @@ const List<ErrorCode> errorCodeValues = [
   HintCode.UNREACHABLE_SWITCH_CASE,
   HintCode.UNUSED_ELEMENT,
   HintCode.UNUSED_ELEMENT_PARAMETER,
-  HintCode.UNUSED_FIELD,
-  HintCode.UNUSED_IMPORT,
-  HintCode.UNUSED_LOCAL_VARIABLE,
-  HintCode.UNUSED_SHOWN_NAME,
   LanguageCode.IMPLICIT_DYNAMIC_FIELD,
   LanguageCode.IMPLICIT_DYNAMIC_FUNCTION,
   LanguageCode.IMPLICIT_DYNAMIC_INVOKE,
@@ -1014,7 +1010,11 @@ const List<ErrorCode> errorCodeValues = [
   WarningCode.UNNECESSARY_WILDCARD_PATTERN,
   WarningCode.UNUSED_CATCH_CLAUSE,
   WarningCode.UNUSED_CATCH_STACK,
+  WarningCode.UNUSED_FIELD,
+  WarningCode.UNUSED_IMPORT,
   WarningCode.UNUSED_LABEL,
+  WarningCode.UNUSED_LOCAL_VARIABLE,
   WarningCode.UNUSED_RESULT,
   WarningCode.UNUSED_RESULT_WITH_MESSAGE,
+  WarningCode.UNUSED_SHOWN_NAME,
 ];

pkg/analyzer/lib/src/error/imports_verifier.dart

@@ -405,8 +405,8 @@ class ImportsVerifier {
       // only way for it to be `null` is if the import contains a string
       // interpolation, in which case the import wouldn't have resolved and
       // would not have been included in [_unusedImports].
-      errorReporter
-          .reportErrorForNode(HintCode.UNUSED_IMPORT, uri, [uri.stringValue!]);
+      errorReporter.reportErrorForNode(
+          WarningCode.UNUSED_IMPORT, uri, [uri.stringValue!]);
     }
   }
 
@@ -432,7 +432,7 @@ class ImportsVerifier {
           // Only generate a hint if we won't also generate a
           // "duplicate_shown_name" hint for the same identifier.
           reporter.reportErrorForNode(
-              HintCode.UNUSED_SHOWN_NAME, identifier, [identifier.name]);
+              WarningCode.UNUSED_SHOWN_NAME, identifier, [identifier.name]);
         }
       }
     });

pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart

@@ -449,8 +449,9 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
 }
 
 /// Instances of the class [UnusedLocalElementsVerifier] traverse an AST
-/// looking for cases of [HintCode.UNUSED_ELEMENT], [HintCode.UNUSED_FIELD],
-/// [HintCode.UNUSED_LOCAL_VARIABLE], etc.
+/// looking for cases of [WarningCode.UNUSED_ELEMENT],
+/// [WarningCode.UNUSED_FIELD],
+/// [WarningCode.UNUSED_LOCAL_VARIABLE], etc.
 class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   /// The error listener to which errors will be reported.
   final AnalysisErrorListener _errorListener;
@@ -902,7 +903,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
   void _visitFieldElement(FieldElement element) {
     if (!_isReadMember(element)) {
       _reportErrorForElement(
-          HintCode.UNUSED_FIELD, element, [element.displayName]);
+          WarningCode.UNUSED_FIELD, element, [element.displayName]);
     }
   }
 
@@ -921,7 +922,7 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
       } else if (_usedElements.isCatchStackTrace(element)) {
         errorCode = WarningCode.UNUSED_CATCH_STACK;
       } else {
-        errorCode = HintCode.UNUSED_LOCAL_VARIABLE;
+        errorCode = WarningCode.UNUSED_LOCAL_VARIABLE;
       }
       _reportErrorForElement(errorCode, element, [element.displayName]);
     }