Version 3.13.0-152.0.dev

Merge de28cc3 into dev

Author: Dart CI

pkg/analysis_server_client/lib/src/protocol/protocol_common.dart

@@ -4,7 +4,7 @@
 //
 // This file has been automatically generated. Please do not edit it manually.
 // To regenerate the file, use the script
-// "pkg/analysis_server/tool/spec/generate_files".
+// "pkg/analyzer_plugin/tool/spec/generate_all.dart".
 
 // ignore_for_file: unnecessary_ignore, duplicate_ignore
 // ignore_for_file: unnecessary_type_name_in_constructor

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

@@ -109,7 +109,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 637;
+  static const int DATA_VERSION = 638;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -86,10 +86,6 @@ class LibraryAnalyzer {
   final Map<FileState, FileAnalysis> _libraryFiles = {};
   late final LibraryVerificationContext _libraryVerificationContext;
 
-  /// One verifier per library so that state of elements can be shared across
-  /// fragments in all files of this library.
-  late final InheritanceOverrideVerifier _inheritanceOverrideVerifier;
-
   final TestingData? _testingData;
   final TypeSystemOperations _typeSystemOperations;
 
@@ -115,10 +111,6 @@ class LibraryAnalyzer {
         typeSystem: _typeSystem,
       ),
     );
-    _inheritanceOverrideVerifier = InheritanceOverrideVerifier(
-      _typeSystem,
-      _inheritance,
-    );
   }
 
   TypeProviderImpl get _typeProvider => _libraryElement.typeProvider;
@@ -341,8 +333,17 @@ class LibraryAnalyzer {
   /// Compute diagnostics in [_libraryFiles], including errors and warnings,
   /// lints, and a few other cases.
   void _computeDiagnostics() {
+    var inheritanceOverrideVerifier = InheritanceOverrideVerifier(
+      _typeSystem,
+      _inheritance,
+      diagnosticReportersByFragment: {
+        for (var fileAnalysis in _libraryFiles.values)
+          fileAnalysis.fragment: fileAnalysis.diagnosticReporter,
+      },
+    );
+
     for (var fileAnalysis in _libraryFiles.values) {
-      _computeVerifyErrors(fileAnalysis);
+      _computeVerifyErrors(fileAnalysis, inheritanceOverrideVerifier);
     }
 
     MemberDuplicateDefinitionVerifier.checkLibrary(
@@ -469,14 +470,17 @@ class LibraryAnalyzer {
     ).afterLibrary();
   }
 
-  void _computeVerifyErrors(FileAnalysis fileAnalysis) {
+  void _computeVerifyErrors(
+    FileAnalysis fileAnalysis,
+    InheritanceOverrideVerifier inheritanceOverrideVerifier,
+  ) {
     var diagnosticReporter = fileAnalysis.diagnosticReporter;
     var unit = fileAnalysis.unit;
 
     _computeConstantErrors(fileAnalysis);
 
     // Compute inheritance and override errors.
-    _inheritanceOverrideVerifier.verifyUnit(unit, diagnosticReporter);
+    inheritanceOverrideVerifier.verifyUnit(unit, diagnosticReporter);
 
     // Use the ErrorVerifier to compute errors.
     ErrorVerifier errorVerifier = ErrorVerifier(

pkg/analyzer/lib/src/dart/element/element.dart

@@ -2143,6 +2143,14 @@ abstract class ElementImpl implements Element {
     setFlag(_ElementStorageFlag.element_hasSinceSdkVersionValue, value);
   }
 
+  /// Whether this element was created for an `augment` declaration that did
+  /// not have a same-kind declaration to augment.
+  @trackedIncludedInId
+  bool get isAugmentationWithoutAugmentedDeclaration {
+    return _firstFragment.isAugmentation &&
+        _firstFragment.previousFragment == null;
+  }
+
   @override
   @trackedIndirectly
   bool get isPrivate {

pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart

@@ -59,8 +59,8 @@ class ExtensionTypeConflictingStaticAndInstanceConflict extends Conflict {
 
 /// Failure because of a getter and a method from direct superinterfaces.
 class GetterMethodConflict extends Conflict {
-  final InternalExecutableElement getter;
-  final InternalExecutableElement method;
+  final InternalGetterElement getter;
+  final InternalMethodElement method;
 
   GetterMethodConflict({
     required super.name,
@@ -381,15 +381,14 @@ class InheritanceManager3 {
   ) {
     assert(candidates.length > 1);
 
-    InternalExecutableElement? getter;
-    InternalExecutableElement? method;
+    InternalGetterElement? getter;
+    InternalMethodElement? method;
     for (var candidate in candidates) {
-      var kind = candidate.kind;
-      if (kind == ElementKind.GETTER) {
-        getter ??= candidate;
-      }
-      if (kind == ElementKind.METHOD) {
-        method ??= candidate;
+      switch (candidate) {
+        case InternalGetterElement():
+          getter ??= candidate;
+        case InternalMethodElement():
+          method ??= candidate;
       }
     }
 
@@ -618,12 +617,16 @@ class InheritanceManager3 {
         if (candidate.enclosingElement == mixinElement) {
           namedCandidates[name] = [candidate];
           if (current.kind != candidate.kind) {
-            var currentIsGetter = current.kind == ElementKind.GETTER;
+            var currentIsGetter = current is InternalGetterElement;
             mixinConflicts.add(
               GetterMethodConflict(
                 name: name,
-                getter: currentIsGetter ? current : candidate,
-                method: currentIsGetter ? candidate : current,
+                getter: currentIsGetter
+                    ? current
+                    : candidate as InternalGetterElement,
+                method: currentIsGetter
+                    ? candidate as InternalMethodElement
+                    : current as InternalMethodElement,
               ),
             );
           }