Remove the STRONG_MODE_ prefix from error codes

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

Author: bwilkerson

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

@@ -4978,8 +4978,6 @@ class StaticWarningCode extends ErrorCode {
  *
  * These error codes tend to use the same message across different severity
  * levels, so they are grouped for clarity.
- *
- * All of these error codes also use the "STRONG_MODE_" prefix in their name.
  */
 class StrongModeCode extends ErrorCode {
   static const String _implicitCastMessage =
@@ -5233,7 +5231,7 @@ class StrongModeCode extends ErrorCode {
   const StrongModeCode(ErrorType type, String name, String message,
       {String correction, bool hasPublishedDocs})
       : type = type,
-        super.temporary('STRONG_MODE_$name', message,
+        super.temporary(name, message,
             correction: correction, hasPublishedDocs: hasPublishedDocs);
 
   @override

pkg/analyzer/lib/src/task/strong/checker.dart

@@ -1278,7 +1278,7 @@ class CodeChecker extends RecursiveAstVisitor {
       _failure = true;
     }
     if (errorCode.type == ErrorType.HINT &&
-        errorCode.name.startsWith('STRONG_MODE_TOP_LEVEL_')) {
+        errorCode.name.startsWith('TOP_LEVEL_')) {
       severity = ErrorSeverity.ERROR;
     }
     if (severity != ErrorSeverity.INFO || _options.strongModeHints) {

pkg/analyzer/test/src/task/options_test.dart

@@ -49,6 +49,24 @@ class ContextConfigurationTest {
   YamlMap parseOptions(String source) =>
       optionsProvider.getOptionsFromString(source);
 
+  test_configure_chromeos_checks() {
+    configureContext('''
+analyzer:
+  optional-checks:
+    chrome-os-manifest-checks
+''');
+    expect(true, analysisOptions.chromeOsManifestChecks);
+  }
+
+  test_configure_chromeos_checks_map() {
+    configureContext('''
+analyzer:
+  optional-checks:
+    chrome-os-manifest-checks : true
+''');
+    expect(true, analysisOptions.chromeOsManifestChecks);
+  }
+
   test_configure_error_processors() {
     configureContext('''
 analyzer:
@@ -126,24 +144,6 @@ analyzer:
     List<String> names = analysisOptions.enabledPluginNames;
     expect(names, ['angular2']);
   }
-
-  test_configure_chromeos_checks() {
-    configureContext('''
-analyzer:
-  optional-checks:
-    chrome-os-manifest-checks
-''');
-    expect(true, analysisOptions.chromeOsManifestChecks);
-  }
-
-  test_configure_chromeos_checks_map() {
-    configureContext('''
-analyzer:
-  optional-checks:
-    chrome-os-manifest-checks : true
-''');
-    expect(true, analysisOptions.chromeOsManifestChecks);
-  }
 }
 
 @reflectiveTest
@@ -188,11 +188,7 @@ class ErrorCodeValuesTest {
                 '_PLUS');
       } else if (errorType == StrongModeCode) {
         void removeCode(StrongModeCode code) {
-          String name = code.name;
-          declaredNames.remove(name);
-          if (name.startsWith('STRONG_MODE_')) {
-            declaredNames.remove(name.substring(12));
-          }
+          declaredNames.remove(code.name);
         }
 
         removeCode(StrongModeCode.DOWN_CAST_COMPOSITE);
@@ -430,7 +426,7 @@ analyzer:
     validate('''
 analyzer:
   errors:
-    strong_mode_assignment_cast: ignore
+    assignment_cast: ignore
 ''', []);
   }
 
@@ -479,22 +475,6 @@ analyzer:
     ''', [AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUES]);
   }
 
-  test_linter_supported_rules() {
-    Registry.ruleRegistry.register(new TestRule());
-    validate('''
-linter:
-  rules:
-    - fantastic_test_rule
-    ''', []);
-  }
-
-  test_linter_unsupported_option() {
-    validate('''
-linter:
-  unsupported: true
-    ''', [AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE]);
-  }
-
   test_chromeos_manifest_checks() {
     validate('''
 analyzer:
@@ -511,6 +491,22 @@ analyzer:
 ''', [AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE]);
   }
 
+  test_linter_supported_rules() {
+    Registry.ruleRegistry.register(new TestRule());
+    validate('''
+linter:
+  rules:
+    - fantastic_test_rule
+    ''', []);
+  }
+
+  test_linter_unsupported_option() {
+    validate('''
+linter:
+  unsupported: true
+    ''', [AnalysisOptionsWarningCode.UNSUPPORTED_OPTION_WITH_LEGAL_VALUE]);
+  }
+
   void validate(String source, List<ErrorCode> expected) {
     var options = optionsProvider.getOptionsFromString(source);
     var errors = validator.validate(options);

pkg/analyzer/test/src/task/strong/strong_test_helper.dart

@@ -55,21 +55,11 @@ SourceSpanWithContext _createSpanHelper(
   return new SourceSpanWithContext(startLoc, endLoc, text, lineText);
 }
 
-String _errorCodeName(ErrorCode errorCode) {
-  var name = errorCode.name;
-  final prefix = 'STRONG_MODE_';
-  if (name.startsWith(prefix)) {
-    return name.substring(prefix.length);
-  } else {
-    return name;
-  }
-}
-
 ErrorSeverity _errorSeverity(
     AnalysisOptions analysisOptions, AnalysisError error) {
   // TODO(brianwilkerson) Remove the if when top-level inference is made an
   // error again.
-  if (error.errorCode.name.startsWith('STRONG_MODE_TOP_LEVEL_')) {
+  if (error.errorCode.name.startsWith('TOP_LEVEL_')) {
     return ErrorSeverity.ERROR;
   }
   return ErrorProcessor.getProcessor(analysisOptions, error)?.severity ??
@@ -192,7 +182,7 @@ void _reportFailure(
         resolutionMap.elementDeclaredByCompilationUnit(unit).source, sourceCode,
         end: offset + length);
     var levelName = _errorSeverity(analysisOptions, error).displayName;
-    return '@$offset $levelName:${_errorCodeName(error.errorCode)}\n' +
+    return '@$offset $levelName:${error.errorCode.name}\n' +
         span.message(error.message);
   }
 
@@ -411,7 +401,7 @@ class _ErrorExpectation {
 
   bool matches(AnalysisOptions options, AnalysisError e) {
     return _errorSeverity(options, e) == severity &&
-        _errorCodeName(e.errorCode) == typeName;
+        e.errorCode.name == typeName;
   }
 
   String toString() => '@$offset ${severity.displayName}: [$typeName]';