Version 2.11.0-235.0.dev

Merge commit '23b9cce2a1219a122529d68a4e702ac10bcf7522' into 'dev'

Author: Dart CI

DEPS

@@ -131,7 +131,7 @@ vars = {
   "pub_rev": "f0c7771b38155d3829a60d60b5dba2784b100811",
   "pub_semver_tag": "v1.4.4",
   "quiver-dart_tag": "246e754fe45cecb6aa5f3f13b4ed61037ff0d784",
-  "resource_rev": "f8e37558a1c4f54550aa463b88a6a831e3e33cd6",
+  "resource_rev": "6b79867d0becf5395e5819a75720963b8298e9a7",
   "root_certificates_rev": "7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8",
   "rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244",
   "shelf_static_rev": "v0.2.8",

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

@@ -62,7 +62,7 @@ class B extends A {
   Future<void> test_named_private() async {
     await resolveTestUnit('''
 class A {
-  A._named(int p); // ignore: unused_element
+  A._named(int p);
 }
 class B extends A {
   B() {}

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

@@ -128,7 +128,7 @@ class B extends A {
   Future<void> test_private() async {
     await resolveTestUnit('''
 class A {
-  A._named(p); // ignore: unused_element
+  A._named(p);
 }
 class B extends A {
 }

pkg/analyzer/lib/error/error.dart

@@ -481,6 +481,7 @@ const List<ErrorCode> errorCodeValues = [
   HintCode.DEPRECATED_MIXIN_FUNCTION,
   HintCode.DIVISION_OPTIMIZATION,
   HintCode.DUPLICATE_HIDDEN_NAME,
+  HintCode.DUPLICATE_IGNORE,
   HintCode.DUPLICATE_IMPORT,
   HintCode.DUPLICATE_SHOWN_NAME,
   HintCode.EQUAL_ELEMENTS_IN_SET,
@@ -560,7 +561,9 @@ const List<ErrorCode> errorCodeValues = [
   HintCode.TYPE_CHECK_IS_NULL,
   HintCode.UNDEFINED_HIDDEN_NAME,
   HintCode.UNDEFINED_SHOWN_NAME,
+  HintCode.UNIGNORABLE_IGNORE,
   HintCode.UNNECESSARY_CAST,
+  HintCode.UNNECESSARY_IGNORE,
   HintCode.UNNECESSARY_NO_SUCH_METHOD,
   HintCode.UNNECESSARY_NULL_COMPARISON_FALSE,
   HintCode.UNNECESSARY_NULL_COMPARISON_TRUE,

pkg/analyzer/lib/src/dart/analysis/file_state.dart

@@ -13,7 +13,6 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/analysis/byte_store.dart';
@@ -27,7 +26,6 @@ import 'package:analyzer/src/dart/analysis/unlinked_api_signature.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
-import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/parser.dart';
 import 'package:analyzer/src/generated/source.dart';
@@ -590,7 +588,11 @@ $content
 ''');
     }
 
-    _setLanguageVersion(unit, scanner.languageVersion, errorListener);
+    var unitImpl = unit as CompilationUnitImpl;
+    unitImpl.languageVersion = LibraryLanguageVersion(
+      package: packageLanguageVersion,
+      override: scanner.overrideVersion,
+    );
 
     // StringToken uses a static instance of StringCanonicalizer, so we need
     // to clear it explicitly once we are done using it for this file.
@@ -613,38 +615,6 @@ $content
     return directive.uri;
   }
 
-  /// Set the language version for the file, from the [versionToken], or from
-  /// the package language version.
-  void _setLanguageVersion(
-    CompilationUnit unit,
-    LanguageVersionToken versionToken,
-    AnalysisErrorListener errorListener,
-  ) {
-    Version overrideVersion;
-    if (versionToken != null) {
-      overrideVersion = Version(versionToken.major, versionToken.minor, 0);
-      var latestVersion = ExperimentStatus.currentVersion;
-      if (overrideVersion > latestVersion) {
-        errorListener.onError(
-          AnalysisError(
-            source,
-            versionToken.offset,
-            versionToken.length,
-            HintCode.INVALID_LANGUAGE_VERSION_OVERRIDE_GREATER,
-            [latestVersion.major, latestVersion.minor],
-          ),
-        );
-        overrideVersion = null;
-      }
-    }
-
-    var unitImpl = unit as CompilationUnitImpl;
-    unitImpl.languageVersion = LibraryLanguageVersion(
-      package: packageLanguageVersion,
-      override: overrideVersion,
-    );
-  }
-
   static UnlinkedUnit2Builder serializeAstUnlinked2(CompilationUnit unit) {
     var exports = <UnlinkedNamespaceDirectiveBuilder>[];
     var imports = <UnlinkedNamespaceDirectiveBuilder>[];
@@ -847,6 +817,19 @@ class FileSystemState {
     return featureSetProvider.getFeatureSet(path, uri);
   }
 
+  Version contextLanguageVersion(
+    String path,
+    Uri uri,
+    WorkspacePackage workspacePackage,
+  ) {
+    var workspaceLanguageVersion = workspacePackage?.languageVersion;
+    if (workspaceLanguageVersion != null) {
+      return workspaceLanguageVersion;
+    }
+
+    return featureSetProvider.getLanguageVersion(path, uri);
+  }
+
   /// Return the canonical [FileState] for the given absolute [path]. The
   /// returned file has the last known state since if was last refreshed.
   ///
@@ -870,7 +853,7 @@ class FileSystemState {
       WorkspacePackage workspacePackage = _workspace?.findPackageFor(path);
       FeatureSet featureSet = contextFeatureSet(path, uri, workspacePackage);
       Version packageLanguageVersion =
-          featureSetProvider.getLanguageVersion(path, uri);
+          contextLanguageVersion(path, uri, workspacePackage);
       file = FileState._(this, path, uri, uriSource, workspacePackage,
           featureSet, packageLanguageVersion);
       _uriToFile[uri] = file;
@@ -914,7 +897,7 @@ class FileSystemState {
       WorkspacePackage workspacePackage = _workspace?.findPackageFor(path);
       FeatureSet featureSet = contextFeatureSet(path, uri, workspacePackage);
       Version packageLanguageVersion =
-          featureSetProvider.getLanguageVersion(path, uri);
+          contextLanguageVersion(path, uri, workspacePackage);
       file = FileState._(this, path, uri, source, workspacePackage, featureSet,
           packageLanguageVersion);
       _uriToFile[uri] = file;

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -22,13 +22,13 @@ import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
-import 'package:analyzer/src/dart/error/syntactic_errors.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/dart/resolver/legacy_type_asserter.dart';
 import 'package:analyzer/src/dart/resolver/resolution_visitor.dart';
 import 'package:analyzer/src/error/best_practices_verifier.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/error/dead_code_verifier.dart';
+import 'package:analyzer/src/error/ignore_validator.dart';
 import 'package:analyzer/src/error/imports_verifier.dart';
 import 'package:analyzer/src/error/inheritance_override.dart';
 import 'package:analyzer/src/error/language_version_override_verifier.dart';
@@ -181,6 +181,16 @@ class LibraryAnalyzer {
 
     _checkForInconsistentLanguageVersionOverride(units);
 
+    // This must happen after all other diagnostics have been computed but
+    // before the list of diagnostics has been filtered.
+    for (var file in _library.libraryFiles) {
+      if (file.source != null) {
+        IgnoreValidator(_getErrorReporter(file), _getErrorListener(file).errors,
+                _fileToIgnoreInfo[file], _fileToLineInfo[file])
+            .reportErrors();
+      }
+    }
+
     timerLibraryAnalyzerVerify.stop();
 
     // Return full results.
@@ -428,39 +438,8 @@ class LibraryAnalyzer {
     bool isIgnored(AnalysisError error) {
       var code = error.errorCode;
       // Don't allow error severity issues to be ignored.
-      if (!code.isIgnorable) {
-        // The [code] is not ignorable, but we've allowed a few "privileged"
-        // cases. Each is annotated with an issue which represents technical
-        // debt. Once cleaned up, we may remove this notion of "privileged".
-        // In the case of [CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY], we may
-        // just decide that it happens enough in tests that it can be declared
-        // an ignorable error, and in practice other back ends will prevent
-        // non-internal code from importing internal code.
-        bool privileged = false;
-
-        if (code == CompileTimeErrorCode.UNDEFINED_FUNCTION ||
-            code == CompileTimeErrorCode.UNDEFINED_PREFIXED_NAME) {
-          // Special case a small number of errors in Flutter code which are
-          // ignored. The erroneous code is found in a conditionally imported
-          // library, which uses a special version of the "dart:ui" library
-          // which the Analyzer does not use during analysis. See
-          // https://github.com/flutter/flutter/issues/52899.
-          if (file.path.contains('flutter')) {
-            privileged = true;
-          }
-        }
-
-        if ((code == CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY ||
-                code == CompileTimeErrorCode.UNDEFINED_ANNOTATION ||
-                code == ParserErrorCode.NATIVE_FUNCTION_BODY_IN_NON_SDK_CODE) &&
-            (file.path.contains('tests/compiler/dart2js') ||
-                file.path.contains('pkg/compiler/test'))) {
-          // Special case the dart2js language tests. Some of these import
-          // various internal libraries.
-          privileged = true;
-        }
-
-        if (!privileged) return false;
+      if (!IgnoreValidator.isIgnorable(file.path, code)) {
+        return false;
       }
 
       int errorLine = lineInfo.getLocation(error.offset).lineNumber;

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

@@ -338,6 +338,18 @@ class HintCode extends AnalyzerErrorCode {
           correction: "Try removing the repeated name from the list of hidden "
               "members.");
 
+  /**
+   * Parameters:
+   * 0: the name of the diagnostic being ignored
+   */
+  static const HintCode DUPLICATE_IGNORE = HintCode(
+      'DUPLICATE_IGNORE',
+      "The diagnostic '{0}' does not need to be ignored here because it is "
+          "already being ignored.",
+      correction:
+          "Try removing the name from the list, or removing the whole comment "
+          "if this is the only name in the list.");
+
   /**
    * Duplicate imports.
    *
@@ -2349,6 +2361,16 @@ class HintCode extends AnalyzerErrorCode {
       correction: "Try removing the name from the list of shown members.",
       hasPublishedDocs: true);
 
+  /**
+   * Parameters:
+   * 0: the name of the non-diagnostic being ignored
+   */
+  static const HintCode UNIGNORABLE_IGNORE = HintCode(
+      'UNIGNORABLE_IGNORE', "The diagnostic '{0}' can't be ignored.",
+      correction:
+          "Try removing the name from the list, or removing the whole comment "
+          "if this is the only name in the list.");
+
   /**
    * No parameters.
    */
@@ -2385,6 +2407,18 @@ class HintCode extends AnalyzerErrorCode {
       'UNNECESSARY_CAST', "Unnecessary cast.",
       correction: "Try removing the cast.", hasPublishedDocs: true);
 
+  /**
+   * Parameters:
+   * 0: the name of the diagnostic being ignored
+   */
+  static const HintCode UNNECESSARY_IGNORE = HintCode(
+      'UNNECESSARY_IGNORE',
+      "The diagnostic '{0}' isn't produced at this location so it doesn't "
+          "need to be ignored.",
+      correction:
+          "Try removing the name from the list, or removing the whole comment "
+          "if this is the only name in the list.");
+
   /**
    * Unnecessary `noSuchMethod` declaration.
    */

pkg/analyzer/lib/src/dart/micro/library_analyzer.dart

@@ -28,6 +28,7 @@ import 'package:analyzer/src/dart/resolver/resolution_visitor.dart';
 import 'package:analyzer/src/error/best_practices_verifier.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/error/dead_code_verifier.dart';
+import 'package:analyzer/src/error/ignore_validator.dart';
 import 'package:analyzer/src/error/imports_verifier.dart';
 import 'package:analyzer/src/error/inheritance_override.dart';
 import 'package:analyzer/src/error/override_verifier.dart';
@@ -245,6 +246,16 @@ class LibraryAnalyzer {
         }
       });
     }
+
+    // This must happen after all other diagnostics have been computed but
+    // before the list of diagnostics has been filtered.
+    for (var file in _library.libraryFiles) {
+      if (file.source != null) {
+        IgnoreValidator(_getErrorReporter(file), _getErrorListener(file).errors,
+                _fileToIgnoreInfo[file], _fileToLineInfo[file])
+            .reportErrors();
+      }
+    }
   }
 
   void _computeHints(FileState file, CompilationUnit unit) {

pkg/analyzer/lib/src/dart/micro/library_graph.dart

@@ -521,6 +521,19 @@ class FileSystemState {
     return featureSetProvider.getFeatureSet(path, uri);
   }
 
+  Version contextLanguageVersion(
+    String path,
+    Uri uri,
+    WorkspacePackage workspacePackage,
+  ) {
+    var workspaceLanguageVersion = workspacePackage?.languageVersion;
+    if (workspaceLanguageVersion != null) {
+      return workspaceLanguageVersion;
+    }
+
+    return featureSetProvider.getLanguageVersion(path, uri);
+  }
+
   FileState getFileForPath({
     @required String path,
     @required OperationPerformanceImpl performance,
@@ -536,7 +549,7 @@ class FileSystemState {
       var workspacePackage = _workspace?.findPackageFor(path);
       var featureSet = contextFeatureSet(path, uri, workspacePackage);
       var packageLanguageVersion =
-          featureSetProvider.getLanguageVersion(path, uri);
+          contextLanguageVersion(path, uri, workspacePackage);
       file = FileState._(this, path, uri, source, workspacePackage, featureSet,
           packageLanguageVersion);
 
@@ -567,7 +580,7 @@ class FileSystemState {
       var workspacePackage = _workspace?.findPackageFor(path);
       var featureSet = contextFeatureSet(path, uri, workspacePackage);
       var packageLanguageVersion =
-          featureSetProvider.getLanguageVersion(path, uri);
+          contextLanguageVersion(path, uri, workspacePackage);
 
       file = FileState._(this, path, uri, source, workspacePackage, featureSet,
           packageLanguageVersion);