Don't add augmentations of class / mixin to export scope.

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

Author: scheglov

pkg/analyzer/lib/src/summary2/element_builder.dart

@@ -108,7 +108,9 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     _linker.elementNodes[element] = node;
 
     var reference = _enclosingContext.addClass(name, element);
-    _libraryBuilder.declare(name, reference);
+    if (!element.isAugmentation) {
+      _libraryBuilder.declare(name, reference);
+    }
 
     var holder = _EnclosingContext(reference, element);
     _withEnclosing(holder, () {
@@ -896,7 +898,9 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
     _linker.elementNodes[element] = node;
 
     var reference = _enclosingContext.addMixin(name, element);
-    _libraryBuilder.declare(name, reference);
+    if (!element.isAugmentation) {
+      _libraryBuilder.declare(name, reference);
+    }
 
     var holder = _EnclosingContext(reference, element);
     _withEnclosing(holder, () {

pkg/analyzer/test/src/summary/elements_test.dart

@@ -25692,33 +25692,38 @@ library
   test_exportScope_augmentation_class() async {
     newFile('$testPackageLibPath/a.dart', r'''
 library augment 'test.dart';
-class A {}
+augment class A {}
+class B {}
 ''');
     var library = await buildLibrary(r'''
 import augment 'a.dart';
-class B {}
+class A {}
 ''');
     configuration.withExportScope = true;
     checkElementText(library, r'''
 library
   definingUnit
     classes
-      class B @31
+      class A @31
+        augmentation: self::@augmentation::package:test/a.dart::@class::A
         constructors
           synthetic @-1
+        augmented
   augmentationImports
     package:test/a.dart
       definingUnit
         classes
-          class A @35
+          augment class A @43
+            augmentationTarget: self::@class::A
+          class B @54
             constructors
               synthetic @-1
   exportedReferences
-    declared self::@augmentation::package:test/a.dart::@class::A
-    declared self::@class::B
+    declared self::@augmentation::package:test/a.dart::@class::B
+    declared self::@class::A
   exportNamespace
-    A: self::@augmentation::package:test/a.dart::@class::A
-    B: self::@class::B
+    A: self::@class::A
+    B: self::@augmentation::package:test/a.dart::@class::B
 ''');
   }
 
@@ -25861,6 +25866,46 @@ library
 ''');
   }
 
+  test_exportScope_augmentation_mixin() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+library augment 'test.dart';
+augment mixin A {}
+mixin B {}
+''');
+    var library = await buildLibrary(r'''
+import augment 'a.dart';
+mixin A {}
+''');
+    configuration.withExportScope = true;
+    checkElementText(library, r'''
+library
+  definingUnit
+    mixins
+      mixin A @31
+        augmentation: self::@augmentation::package:test/a.dart::@mixin::A
+        superclassConstraints
+          Object
+        augmented
+          superclassConstraints
+            Object
+  augmentationImports
+    package:test/a.dart
+      definingUnit
+        mixins
+          augment mixin A @43
+            augmentationTarget: self::@mixin::A
+          mixin B @54
+            superclassConstraints
+              Object
+  exportedReferences
+    declared self::@augmentation::package:test/a.dart::@mixin::B
+    declared self::@mixin::A
+  exportNamespace
+    A: self::@mixin::A
+    B: self::@augmentation::package:test/a.dart::@mixin::B
+''');
+  }
+
   test_exportScope_augmentation_nested_class() async {
     newFile('$testPackageLibPath/a.dart', r'''
 library augment 'test.dart';