Version 3.5.0-179.0.dev

Merge bd8f87d into dev
dart-lang · May 22, 2024 · 8e6839f · 8e6839f
2 parents fca7dd7 + bd8f87d
commit 8e6839f
Show file tree

Hide file tree

Showing 16 changed files with 205 additions and 406 deletions.
diff --git a/docs/Building.md b/docs/Building.md
@@ -1,10 +1,3 @@
-> [!IMPORTANT]
-> This page was copied from https://github.com/dart-lang/sdk/wiki and needs review.
-> Please [contribute](../CONTRIBUTING.md) changes to bring it up-to-date -
-> removing this header - or send a CL to delete the file.
-
----
-
 [Dependencies](#dependencies)
 
 [Getting the source](#source)

diff --git a/docs/Chrome-63-Dart-Web-Libraries.md b/docs/Chrome-63-Dart-Web-Libraries.md
diff --git a/docs/Commit-Message-Best-Practices.md b/docs/Commit-Message-Best-Practices.md
@@ -1,10 +1,3 @@
-> [!IMPORTANT]
-> This page was copied from https://github.com/dart-lang/sdk/wiki and needs review.
-> Please [contribute](../CONTRIBUTING.md) changes to bring it up-to-date -
-> removing this header - or send a CL to delete the file.
-
----
-
 1. First line is a capitalized, short (50 chars or less) summary,
    * Please include the component for which the change is being made in the first line
      * **[Analyzer]** short (50 chars or less) summary

diff --git a/docs/Publishing-package-analyzer.md b/docs/Publishing-package-analyzer.md
diff --git a/docs/Writing-Web-Browser-Tests.md b/docs/Writing-Web-Browser-Tests.md
diff --git a/pkg/analyzer/lib/src/summary2/macro_declarations.dart b/pkg/analyzer/lib/src/summary2/macro_declarations.dart
@@ -1616,23 +1616,23 @@ class DeclarationBuilderFromNode {
     switch (parentNode) {
       case ast.ClassDeclaration():
         var parentElement = parentNode.declaredElement!;
-        var typeElement = parentElement.augmentationTarget ?? parentElement;
+        var typeElement = parentElement.augmented.declaration;
         return _declaredIdentifier(parentNode.name, typeElement);
       case ast.EnumDeclaration():
         var parentElement = parentNode.declaredElement!;
-        var typeElement = parentElement.augmentationTarget ?? parentElement;
+        var typeElement = parentElement.augmented.declaration;
         return _declaredIdentifier(parentNode.name, typeElement);
       case ast.ExtensionDeclaration():
         var parentElement = parentNode.declaredElement!;
-        var typeElement = parentElement.augmentationTarget ?? parentElement;
+        var typeElement = parentElement.augmented.declaration;
         return _declaredIdentifier2(parentNode.name?.lexeme ?? '', typeElement);
       case ast.ExtensionTypeDeclaration():
         var parentElement = parentNode.declaredElement!;
-        var typeElement = parentElement.augmentationTarget ?? parentElement;
+        var typeElement = parentElement.augmented.declaration;
         return _declaredIdentifier(parentNode.name, typeElement);
       case ast.MixinDeclaration():
         var parentElement = parentNode.declaredElement!;
-        var typeElement = parentElement.augmentationTarget ?? parentElement;
+        var typeElement = parentElement.augmented.declaration;
         return _declaredIdentifier(parentNode.name, typeElement);
       default:
         // TODO(scheglov): other parents