diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index ce115e3ed2b..e10c8783700 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -4710,9 +4710,9 @@ abstract class InstanceFragmentImpl extends FragmentImpl
     fragment.enclosingFragment = this;
   }
 
-  void addTypeParameter(TypeParameterFragmentImpl typeParameter) {
-    _typeParameters.add(typeParameter);
-    typeParameter.enclosingFragment = this;
+  void addTypeParameter(TypeParameterFragmentImpl fragment) {
+    _typeParameters.add(fragment);
+    fragment.enclosingFragment = this;
   }
 }
 
diff --git a/pkg/analyzer/lib/src/summary2/element_builder.dart b/pkg/analyzer/lib/src/summary2/element_builder.dart
index e743c2a122c..c26b9afaee0 100644
--- a/pkg/analyzer/lib/src/summary2/element_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/element_builder.dart
@@ -201,7 +201,7 @@ class ElementBuilder {
         fragment.typeParameters.length = lastTypeParameterFragments.length;
       }
 
-      // Synthesize missing type parameters.
+      // Add missing type parameters.
       if (lastTypeParameterFragments.length > fragment.typeParameters.length) {
         for (
           var i = fragment.typeParameters.length;
diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index 2fc6bbae0f4..39f6053e261 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart
@@ -23580,223 +23580,126 @@ library
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_fields_add_generic() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T1> {
-  T1 foo2;
-}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
-class A<T1> {
-  T1 foo1;
+class A<T> {
+  T foo1;
+}
+
+augment class A<T> {
+  T foo2;
 }
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T1 @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          fields
-            foo1 @34
-              reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingElement3: <testLibraryFragment>::@class::A
-              type: T1
-              id: field_0
-              getter: getter_0
-              setter: setter_0
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          accessors
-            synthetic get foo1 @-1
-              reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingElement3: <testLibraryFragment>::@class::A
-              returnType: T1
-              id: getter_0
-              variable: field_0
-            synthetic set foo1= @-1
-              reference: <testLibraryFragment>::@class::A::@setter::foo1
-              enclosingElement3: <testLibraryFragment>::@class::A
-              parameters
-                requiredPositional _foo1 @-1
-                  type: T1
-              returnType: void
-              id: setter_0
-              variable: field_0
-          augmented
-            fields
-              <testLibraryFragment>::@class::A::@field::foo1
-              FieldMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-                augmentationSubstitution: {T1: T1}
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-            accessors
-              <testLibraryFragment>::@class::A::@getter::foo1
-              <testLibraryFragment>::@class::A::@setter::foo1
-              GetterMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-                augmentationSubstitution: {T1: T1}
-              SetterMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-                augmentationSubstitution: {T1: T1}
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T1 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          fields
-            foo2 @48
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              type: T1
-              id: field_1
-              getter: getter_1
-              setter: setter_1
-          accessors
-            synthetic get foo2 @-1
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              returnType: T1
-              id: getter_1
-              variable: field_1
-            synthetic set foo2= @-1
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              parameters
-                requiredPositional _foo2 @-1
-                  type: T1
-              returnType: void
-              id: setter_1
-              variable: field_1
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T1 @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           fields
-            foo1 @34
-              reference: <testLibraryFragment>::@class::A::@field::foo1
-              element: <testLibraryFragment>::@class::A::@field::foo1#element
-              getter2: <testLibraryFragment>::@class::A::@getter::foo1
-              setter2: <testLibraryFragment>::@class::A::@setter::foo1
+            #F5 foo1 (nameOffset:17) (firstTokenOffset:17) (offset:17)
+              element: <testLibrary>::@class::A::@field::foo1
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F6 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
           getters
-            synthetic get foo1
-              reference: <testLibraryFragment>::@class::A::@getter::foo1
-              element: <testLibraryFragment>::@class::A::@getter::foo1#element
+            #F7 synthetic foo1 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:17)
+              element: <testLibrary>::@class::A::@getter::foo1
           setters
-            synthetic set foo1
-              reference: <testLibraryFragment>::@class::A::@setter::foo1
-              element: <testLibraryFragment>::@class::A::@setter::foo1#element
+            #F8 synthetic foo1 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:17)
+              element: <testLibrary>::@class::A::@setter::foo1
               formalParameters
-                _foo1
-                  element: <testLibraryFragment>::@class::A::@setter::foo1::@parameter::_foo1#element
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+                #F9 value (nameOffset:<null>) (firstTokenOffset:<null>) (offset:17)
+                  element: <testLibrary>::@class::A::@setter::foo1::@formalParameter::value
+        #F2 class A (nameOffset:40) (firstTokenOffset:26) (offset:40)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T1 @37
-              element: <not-implemented>
+            #F4 T (nameOffset:42) (firstTokenOffset:42) (offset:42)
+              element: #E0 T
+              previousFragment: #F3
           fields
-            foo2 @48
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2#element
-              getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              setter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
+            #F10 foo2 (nameOffset:51) (firstTokenOffset:51) (offset:51)
+              element: <testLibrary>::@class::A::@field::foo2
           getters
-            synthetic get foo2
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2#element
+            #F11 synthetic foo2 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:51)
+              element: <testLibrary>::@class::A::@getter::foo2
           setters
-            synthetic set foo2
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2#element
+            #F12 synthetic foo2 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:51)
+              element: <testLibrary>::@class::A::@setter::foo2
               formalParameters
-                _foo2
-                  element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2::@parameter::_foo2#element
+                #F13 value (nameOffset:<null>) (firstTokenOffset:<null>) (offset:51)
+                  element: <testLibrary>::@class::A::@setter::foo2::@formalParameter::value
   classes
-    class A
+    hasNonFinalField class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T1
+        #E0 T
+          firstFragment: #F3
       fields
         foo1
-          firstFragment: <testLibraryFragment>::@class::A::@field::foo1
-          type: T1
-          getter: <testLibraryFragment>::@class::A::@getter::foo1#element
-          setter: <testLibraryFragment>::@class::A::@setter::foo1#element
+          reference: <testLibrary>::@class::A::@field::foo1
+          firstFragment: #F5
+          hasEnclosingTypeParameterReference: true
+          type: T
+          getter: <testLibrary>::@class::A::@getter::foo1
+          setter: <testLibrary>::@class::A::@setter::foo1
         foo2
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-          type: T1
-          getter: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2#element
-          setter: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2#element
+          reference: <testLibrary>::@class::A::@field::foo2
+          firstFragment: #F10
+          hasEnclosingTypeParameterReference: true
+          type: T
+          getter: <testLibrary>::@class::A::@getter::foo2
+          setter: <testLibrary>::@class::A::@setter::foo2
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F6
       getters
-        synthetic get foo1
-          firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
-        synthetic get foo2
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
+        synthetic foo1
+          reference: <testLibrary>::@class::A::@getter::foo1
+          firstFragment: #F7
+          hasEnclosingTypeParameterReference: true
+          returnType: T
+          variable: <testLibrary>::@class::A::@field::foo1
+        synthetic foo2
+          reference: <testLibrary>::@class::A::@getter::foo2
+          firstFragment: #F11
+          hasEnclosingTypeParameterReference: true
+          returnType: T
+          variable: <testLibrary>::@class::A::@field::foo2
       setters
-        synthetic set foo1
-          firstFragment: <testLibraryFragment>::@class::A::@setter::foo1
+        synthetic foo1
+          reference: <testLibrary>::@class::A::@setter::foo1
+          firstFragment: #F8
+          hasEnclosingTypeParameterReference: true
           formalParameters
-            requiredPositional _foo1
-              type: T1
-        synthetic set foo2
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@setter::foo2
+            #E1 requiredPositional value
+              firstFragment: #F9
+              type: T
+          returnType: void
+          variable: <testLibrary>::@class::A::@field::foo1
+        synthetic foo2
+          reference: <testLibrary>::@class::A::@setter::foo2
+          firstFragment: #F12
+          hasEnclosingTypeParameterReference: true
           formalParameters
-            requiredPositional _foo2
-              type: T1
+            #E2 requiredPositional value
+              firstFragment: #F13
+              type: T
+          returnType: void
+          variable: <testLibrary>::@class::A::@field::foo2
 ''');
   }
 
@@ -24204,170 +24107,91 @@ library
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_getters_add_generic() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T1> {
-  T1 get foo2;
-}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
-class A<T1> {
-  T1 get foo1;
+class A<T> {
+  T get foo1;
+}
+
+augment class A<T> {
+  T get foo2;
 }
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T1 @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          fields
-            synthetic foo1 @-1
-              reference: <testLibraryFragment>::@class::A::@field::foo1
-              enclosingElement3: <testLibraryFragment>::@class::A
-              type: T1
-              id: field_0
-              getter: getter_0
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          accessors
-            abstract get foo1 @38
-              reference: <testLibraryFragment>::@class::A::@getter::foo1
-              enclosingElement3: <testLibraryFragment>::@class::A
-              returnType: T1
-              id: getter_0
-              variable: field_0
-          augmented
-            fields
-              <testLibraryFragment>::@class::A::@field::foo1
-              FieldMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-                augmentationSubstitution: {T1: T1}
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-            accessors
-              <testLibraryFragment>::@class::A::@getter::foo1
-              GetterMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-                augmentationSubstitution: {T1: T1}
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T1 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          fields
-            synthetic foo2 @-1
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              type: T1
-              id: field_1
-              getter: getter_1
-          accessors
-            abstract get foo2 @52
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              returnType: T1
-              id: getter_1
-              variable: field_1
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T1 @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           fields
-            synthetic foo1
-              reference: <testLibraryFragment>::@class::A::@field::foo1
-              element: <testLibraryFragment>::@class::A::@field::foo1#element
-              getter2: <testLibraryFragment>::@class::A::@getter::foo1
+            #F5 synthetic foo1 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@field::foo1
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F6 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
           getters
-            get foo1 @38
-              reference: <testLibraryFragment>::@class::A::@getter::foo1
-              element: <testLibraryFragment>::@class::A::@getter::foo1#element
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+            #F7 foo1 (nameOffset:21) (firstTokenOffset:15) (offset:21)
+              element: <testLibrary>::@class::A::@getter::foo1
+        #F2 class A (nameOffset:44) (firstTokenOffset:30) (offset:44)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T1 @37
-              element: <not-implemented>
+            #F4 T (nameOffset:46) (firstTokenOffset:46) (offset:46)
+              element: #E0 T
+              previousFragment: #F3
           fields
-            synthetic foo2
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2#element
-              getter2: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
+            #F8 synthetic foo2 (nameOffset:<null>) (firstTokenOffset:<null>) (offset:44)
+              element: <testLibrary>::@class::A::@field::foo2
           getters
-            get foo2 @52
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2#element
+            #F9 foo2 (nameOffset:59) (firstTokenOffset:53) (offset:59)
+              element: <testLibrary>::@class::A::@getter::foo2
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T1
+        #E0 T
+          firstFragment: #F3
       fields
         synthetic foo1
-          firstFragment: <testLibraryFragment>::@class::A::@field::foo1
-          type: T1
-          getter: <testLibraryFragment>::@class::A::@getter::foo1#element
+          reference: <testLibrary>::@class::A::@field::foo1
+          firstFragment: #F5
+          hasEnclosingTypeParameterReference: true
+          type: T
+          getter: <testLibrary>::@class::A::@getter::foo1
         synthetic foo2
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@field::foo2
-          type: T1
-          getter: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2#element
+          reference: <testLibrary>::@class::A::@field::foo2
+          firstFragment: #F8
+          hasEnclosingTypeParameterReference: true
+          type: T
+          getter: <testLibrary>::@class::A::@getter::foo2
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F6
       getters
-        abstract get foo1
-          firstFragment: <testLibraryFragment>::@class::A::@getter::foo1
-        abstract get foo2
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@getter::foo2
+        abstract foo1
+          reference: <testLibrary>::@class::A::@getter::foo1
+          firstFragment: #F7
+          hasEnclosingTypeParameterReference: true
+          returnType: T
+          variable: <testLibrary>::@class::A::@field::foo1
+        abstract foo2
+          reference: <testLibrary>::@class::A::@getter::foo2
+          firstFragment: #F9
+          hasEnclosingTypeParameterReference: true
+          returnType: T
+          variable: <testLibrary>::@class::A::@field::foo2
 ''');
   }
 
@@ -24887,315 +24711,169 @@ library
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_interfaces_generic() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T2> implements I2<T2> {}
-class I2<E> {}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
 class A<T> implements I1 {}
 class I1 {}
+
+augment class A<T> implements I2<T> {}
+class I2<E> {}
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          interfaces
-            I1
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          augmented
-            interfaces
-              I1
-              I2<T>
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-        class I1 @49
-          reference: <testLibraryFragment>::@class::I1
-          enclosingElement3: <testLibraryFragment>
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::I1
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T2 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          interfaces
-            I2<T2>
-        class I2 @68
-          reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant E @71
-              defaultType: dynamic
-          constructors
-            synthetic @-1
-              reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F5 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
-        class I1 @49
-          reference: <testLibraryFragment>::@class::I1
+        #F6 class I1 (nameOffset:34) (firstTokenOffset:28) (offset:34)
           element: <testLibrary>::@class::I1
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::I1::@constructor::new
-              element: <testLibraryFragment>::@class::I1::@constructor::new#element
+            #F7 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:34)
+              element: <testLibrary>::@class::I1::@constructor::new
               typeName: I1
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+        #F2 class A (nameOffset:55) (firstTokenOffset:41) (offset:55)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T2 @37
-              element: <not-implemented>
-        class I2 @68
-          reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
+            #F4 T (nameOffset:57) (firstTokenOffset:57) (offset:57)
+              element: #E0 T
+              previousFragment: #F3
+        #F8 class I2 (nameOffset:86) (firstTokenOffset:80) (offset:86)
           element: <testLibrary>::@class::I2
           typeParameters
-            E @71
-              element: <not-implemented>
+            #F9 E (nameOffset:89) (firstTokenOffset:89) (offset:89)
+              element: #E1 E
           constructors
-            synthetic new
-              reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              element: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new#element
+            #F10 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:86)
+              element: <testLibrary>::@class::I2::@constructor::new
               typeName: I2
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T
+        #E0 T
+          firstFragment: #F3
       interfaces
         I1
         I2<T>
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F5
     class I1
       reference: <testLibrary>::@class::I1
-      firstFragment: <testLibraryFragment>::@class::I1
+      firstFragment: #F6
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
+          reference: <testLibrary>::@class::I1::@constructor::new
+          firstFragment: #F7
     class I2
       reference: <testLibrary>::@class::I2
-      firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
+      firstFragment: #F8
       typeParameters
-        E
+        #E1 E
+          firstFragment: #F9
       constructors
         synthetic new
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
+          reference: <testLibrary>::@class::I2::@constructor::new
+          firstFragment: #F10
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_interfaces_generic_mismatch() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T2, T3> implements I2<T2> {}
-class I2<E> {}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
 class A<T> implements I1 {}
 class I1 {}
+
+augment class A<T, T2> implements I2<T2> {}
+class I2<E> {}
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          interfaces
-            I1
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          augmented
-            interfaces
-              I1
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-        class I1 @49
-          reference: <testLibraryFragment>::@class::I1
-          enclosingElement3: <testLibraryFragment>
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::I1::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::I1
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T2 @37
-              defaultType: dynamic
-            covariant T3 @41
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          interfaces
-            I2<T2>
-        class I2 @72
-          reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant E @75
-              defaultType: dynamic
-          constructors
-            synthetic @-1
-              reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@class::I2
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F5 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
-        class I1 @49
-          reference: <testLibraryFragment>::@class::I1
+        #F6 class I1 (nameOffset:34) (firstTokenOffset:28) (offset:34)
           element: <testLibrary>::@class::I1
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::I1::@constructor::new
-              element: <testLibraryFragment>::@class::I1::@constructor::new#element
+            #F7 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:34)
+              element: <testLibrary>::@class::I1::@constructor::new
               typeName: I1
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+        #F2 class A (nameOffset:55) (firstTokenOffset:41) (offset:55)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T2 @37
-              element: <not-implemented>
-            T3 @41
-              element: <not-implemented>
-        class I2 @72
-          reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2
+            #F4 T (nameOffset:57) (firstTokenOffset:57) (offset:57)
+              element: #E0 T
+              previousFragment: #F3
+        #F8 class I2 (nameOffset:91) (firstTokenOffset:85) (offset:91)
           element: <testLibrary>::@class::I2
           typeParameters
-            E @75
-              element: <not-implemented>
+            #F9 E (nameOffset:94) (firstTokenOffset:94) (offset:94)
+              element: #E1 E
           constructors
-            synthetic new
-              reference: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
-              element: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new#element
+            #F10 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:91)
+              element: <testLibrary>::@class::I2::@constructor::new
               typeName: I2
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T
+        #E0 T
+          firstFragment: #F3
       interfaces
         I1
+        I2<InvalidType>
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F5
     class I1
       reference: <testLibrary>::@class::I1
-      firstFragment: <testLibraryFragment>::@class::I1
+      firstFragment: #F6
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::I1::@constructor::new
+          reference: <testLibrary>::@class::I1::@constructor::new
+          firstFragment: #F7
     class I2
       reference: <testLibrary>::@class::I2
-      firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2
+      firstFragment: #F8
       typeParameters
-        E
+        #E1 E
+          firstFragment: #F9
       constructors
         synthetic new
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@class::I2::@constructor::new
+          reference: <testLibrary>::@class::I2::@constructor::new
+          firstFragment: #F10
 ''');
   }
 
@@ -25761,257 +25439,134 @@ library
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_methods_generic() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T2> {
-  T2 bar() => throw 0;
-}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
 class A<T> {
   T foo() => throw 0;
 }
+
+augment class A<T> {
+  T bar() => throw 0;
+}
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          methods
-            foo @32
-              reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingElement3: <testLibraryFragment>::@class::A
-              returnType: T
-          augmented
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-            methods
-              MethodMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-                augmentationSubstitution: {T2: T}
-              <testLibraryFragment>::@class::A::@method::foo
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T2 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          methods
-            bar @48
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              returnType: T2
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F5 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
           methods
-            foo @32
-              reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+            #F6 foo (nameOffset:17) (firstTokenOffset:15) (offset:17)
+              element: <testLibrary>::@class::A::@method::foo
+        #F2 class A (nameOffset:52) (firstTokenOffset:38) (offset:52)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T2 @37
-              element: <not-implemented>
+            #F4 T (nameOffset:54) (firstTokenOffset:54) (offset:54)
+              element: #E0 T
+              previousFragment: #F3
           methods
-            bar @48
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
-              element: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar#element
+            #F7 bar (nameOffset:63) (firstTokenOffset:61) (offset:63)
+              element: <testLibrary>::@class::A::@method::bar
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T
+        #E0 T
+          firstFragment: #F3
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F5
       methods
         foo
           reference: <testLibrary>::@class::A::@method::foo
-          firstFragment: <testLibraryFragment>::@class::A::@method::foo
+          firstFragment: #F6
+          hasEnclosingTypeParameterReference: true
+          returnType: T
         bar
           reference: <testLibrary>::@class::A::@method::bar
-          firstFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@method::bar
+          firstFragment: #F7
+          hasEnclosingTypeParameterReference: true
+          returnType: T
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_augmented_methods_generic_augment() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class A<T2> {
-  augment T2 foo() => throw 0;
-}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
 class A<T> {
   T foo() => throw 0;
 }
+
+augment class A<T> {
+  augment T foo() => throw 0;
+}
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T @23
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-          methods
-            foo @32
-              reference: <testLibraryFragment>::@class::A::@method::foo
-              enclosingElement3: <testLibraryFragment>::@class::A
-              returnType: T
-              augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-          augmented
-            constructors
-              <testLibraryFragment>::@class::A::@constructor::new
-            methods
-              MethodMember
-                base: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-                augmentationSubstitution: {T2: T}
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T2 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::A
-          methods
-            augment foo @56
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              enclosingElement3: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
-              returnType: T2
-              augmentationTarget: <testLibraryFragment>::@class::A::@method::foo
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+          nextFragment: #F2
           typeParameters
-            T @23
-              element: <not-implemented>
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
+              nextFragment: #F4
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F5 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
           methods
-            foo @32
-              reference: <testLibraryFragment>::@class::A::@method::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
-              nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class A @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A
+            #F6 foo (nameOffset:17) (firstTokenOffset:15) (offset:17)
+              element: <testLibrary>::@class::A::@method::foo
+              nextFragment: #F7
+        #F2 class A (nameOffset:52) (firstTokenOffset:38) (offset:52)
           element: <testLibrary>::@class::A
-          previousFragment: <testLibraryFragment>::@class::A
+          previousFragment: #F1
           typeParameters
-            T2 @37
-              element: <not-implemented>
+            #F4 T (nameOffset:54) (firstTokenOffset:54) (offset:54)
+              element: #E0 T
+              previousFragment: #F3
           methods
-            augment foo @56
-              reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::A::@methodAugmentation::foo
-              element: <testLibraryFragment>::@class::A::@method::foo#element
-              previousFragment: <testLibraryFragment>::@class::A::@method::foo
+            #F7 augment foo (nameOffset:71) (firstTokenOffset:61) (offset:71)
+              element: <testLibrary>::@class::A::@method::foo
+              previousFragment: #F6
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T
+        #E0 T
+          firstFragment: #F3
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F5
       methods
         foo
           reference: <testLibrary>::@class::A::@method::foo
-          firstFragment: <testLibraryFragment>::@class::A::@method::foo
+          firstFragment: #F6
+          hasEnclosingTypeParameterReference: true
+          returnType: T
 ''');
   }
 
@@ -27689,135 +27244,73 @@ library
 ''');
   }
 
-  @SkippedTest(reason: 'Causes exception')
   test_supertype_fromAugmentation() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-part of 'test.dart';
-augment class B<T2> extends A<T2> {}
-''');
-
     var library = await buildLibrary(r'''
-part 'a.dart';
 class A<T> {}
-class B<T1> {}
+class B<T> {}
+
+augment class B<T> extends A<T> {}
 ''');
 
     checkElementText(library, r'''
-library
-  reference: <testLibrary>
-  definingUnit: <testLibraryFragment>
-  units
-    <testLibraryFragment>
-      enclosingElement3: <null>
-      parts
-        part_0
-          uri: package:test/a.dart
-          enclosingElement3: <testLibraryFragment>
-          unit: <testLibrary>::@fragment::package:test/a.dart
-      classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T @23
-              defaultType: dynamic
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::A
-        class B @35
-          reference: <testLibraryFragment>::@class::B
-          enclosingElement3: <testLibraryFragment>
-          typeParameters
-            covariant T1 @37
-              defaultType: dynamic
-          augmentation: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::B
-          supertype: A<T1>
-          constructors
-            synthetic @-1
-              reference: <testLibraryFragment>::@class::B::@constructor::new
-              enclosingElement3: <testLibraryFragment>::@class::B
-              superConstructor: ConstructorMember
-                base: <testLibraryFragment>::@class::A::@constructor::new
-                substitution: {T: T1}
-          augmented
-            constructors
-              <testLibraryFragment>::@class::B::@constructor::new
-    <testLibrary>::@fragment::package:test/a.dart
-      enclosingElement3: <testLibraryFragment>
-      classes
-        augment class B @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::B
-          enclosingElement3: <testLibrary>::@fragment::package:test/a.dart
-          typeParameters
-            covariant T2 @37
-              defaultType: dynamic
-          augmentationTarget: <testLibraryFragment>::@class::B
-----------------------------------------
 library
   reference: <testLibrary>
   fragments
-    <testLibraryFragment>
+    #F0 <testLibraryFragment>
       element: <testLibrary>
-      nextFragment: <testLibrary>::@fragment::package:test/a.dart
       classes
-        class A @21
-          reference: <testLibraryFragment>::@class::A
+        #F1 class A (nameOffset:6) (firstTokenOffset:0) (offset:6)
           element: <testLibrary>::@class::A
           typeParameters
-            T @23
-              element: <not-implemented>
+            #F2 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::A::@constructor::new
-              element: <testLibraryFragment>::@class::A::@constructor::new#element
+            #F3 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:6)
+              element: <testLibrary>::@class::A::@constructor::new
               typeName: A
-        class B @35
-          reference: <testLibraryFragment>::@class::B
+        #F4 class B (nameOffset:20) (firstTokenOffset:14) (offset:20)
           element: <testLibrary>::@class::B
-          nextFragment: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::B
+          nextFragment: #F5
           typeParameters
-            T1 @37
-              element: <not-implemented>
+            #F6 T (nameOffset:22) (firstTokenOffset:22) (offset:22)
+              element: #E1 T
+              nextFragment: #F7
           constructors
-            synthetic new
-              reference: <testLibraryFragment>::@class::B::@constructor::new
-              element: <testLibraryFragment>::@class::B::@constructor::new#element
+            #F8 synthetic new (nameOffset:<null>) (firstTokenOffset:<null>) (offset:20)
+              element: <testLibrary>::@class::B::@constructor::new
               typeName: B
-              superConstructor: ConstructorMember
-                base: <testLibraryFragment>::@class::A::@constructor::new
-                substitution: {T: T1}
-    <testLibrary>::@fragment::package:test/a.dart
-      element: <testLibrary>
-      enclosingFragment: <testLibraryFragment>
-      previousFragment: <testLibraryFragment>
-      classes
-        class B @35
-          reference: <testLibrary>::@fragment::package:test/a.dart::@classAugmentation::B
+        #F5 class B (nameOffset:43) (firstTokenOffset:29) (offset:43)
           element: <testLibrary>::@class::B
-          previousFragment: <testLibraryFragment>::@class::B
+          previousFragment: #F4
           typeParameters
-            T2 @37
-              element: <not-implemented>
+            #F7 T (nameOffset:45) (firstTokenOffset:45) (offset:45)
+              element: #E1 T
+              previousFragment: #F6
   classes
     class A
       reference: <testLibrary>::@class::A
-      firstFragment: <testLibraryFragment>::@class::A
+      firstFragment: #F1
       typeParameters
-        T
+        #E0 T
+          firstFragment: #F2
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::A::@constructor::new
+          reference: <testLibrary>::@class::A::@constructor::new
+          firstFragment: #F3
     class B
       reference: <testLibrary>::@class::B
-      firstFragment: <testLibraryFragment>::@class::B
+      firstFragment: #F4
       typeParameters
-        T1
-      supertype: A<T1>
+        #E1 T
+          firstFragment: #F6
+      supertype: A<T>
       constructors
         synthetic new
-          firstFragment: <testLibraryFragment>::@class::B::@constructor::new
-          superConstructor: <testLibraryFragment>::@class::A::@constructor::new#element
+          reference: <testLibrary>::@class::B::@constructor::new
+          firstFragment: #F8
+          superConstructor: ConstructorMember
+            baseElement: <testLibrary>::@class::A::@constructor::new
+            substitution: {T: T}
 ''');
   }
 
@@ -28050,8 +27543,8 @@ library
 
   test_typeParameters_bounds_01() async {
     var library = await buildLibrary(r'''
-class A<T2> {}
-augment class A<T2 extends int> {}
+class A<T> {}
+augment class A<T extends int> {}
 ''');
 
     configuration.withConstructors = false;
@@ -28066,22 +27559,22 @@ library
           element: <testLibrary>::@class::A
           nextFragment: #F2
           typeParameters
-            #F3 T2 (nameOffset:8) (firstTokenOffset:8) (offset:8)
-              element: #E0 T2
+            #F3 T (nameOffset:8) (firstTokenOffset:8) (offset:8)
+              element: #E0 T
               nextFragment: #F4
-        #F2 class A (nameOffset:29) (firstTokenOffset:15) (offset:29)
+        #F2 class A (nameOffset:28) (firstTokenOffset:14) (offset:28)
           element: <testLibrary>::@class::A
           previousFragment: #F1
           typeParameters
-            #F4 T2 (nameOffset:31) (firstTokenOffset:31) (offset:31)
-              element: #E0 T2
+            #F4 T (nameOffset:30) (firstTokenOffset:30) (offset:30)
+              element: #E0 T
               previousFragment: #F3
   classes
     class A
       reference: <testLibrary>::@class::A
       firstFragment: #F1
       typeParameters
-        #E0 T2
+        #E0 T
           firstFragment: #F3
 ''');
   }