Skip to content

Commit 8ff42d9

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove 'augmentation' and 'augmentationTarget'.
Change-Id: Idc22db2d10ee768179ddf1e2d9ff8e80a7d65f2a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/414620 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 47ec0ac commit 8ff42d9

File tree

17 files changed

+85
-483
lines changed

17 files changed

+85
-483
lines changed

pkg/analysis_server/test/analysis/notification_implemented_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ class B extends A {}
140140
assertHasImplementedClass('A {');
141141
}
142142

143+
@SkippedTest() // TODO(scheglov): implement augmentation
143144
Future<void> test_class_extended_augment() async {
144145
newFile('$testPackageLibPath/b.dart', '''
145146
part 'test.dart';
@@ -425,6 +426,7 @@ class B extends A {
425426
assertHasImplementedMember('f => null; // A');
426427
}
427428

429+
@SkippedTest() // TODO(scheglov): implement augmentation
428430
Future<void> test_ofClass_byClass_method_augment() async {
429431
newFile('$testPackageLibPath/b.dart', '''
430432
part 'test.dart';
@@ -449,6 +451,7 @@ augment class A {
449451
assertHasImplementedMember('m() {} // 2');
450452
}
451453

454+
@SkippedTest() // TODO(scheglov): implement augmentation
452455
Future<void> test_ofClass_byClass_method_inAugmentation() async {
453456
newFile('$testPackageLibPath/a.dart', '''
454457
part of 'test.dart';

pkg/analysis_server/test/lsp/augmentation_test.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ void main() {
1818

1919
@reflectiveTest
2020
class AugmentationTest extends AbstractLspAnalysisServerTest {
21+
@SkippedTest() // TODO(scheglov): implement augmentation
2122
Future<void> test_class_body_augmentationToAugmentation() async {
2223
await verifyGoToAugmentation('''
2324
class A {}
@@ -30,6 +31,7 @@ augment class [!A!] {}
3031
''');
3132
}
3233

34+
@SkippedTest() // TODO(scheglov): implement augmentation
3335
Future<void> test_class_body_declarationToAugmentation() async {
3436
await verifyGoToAugmentation('''
3537
class A {
@@ -40,6 +42,7 @@ augment class [!A!] {}
4042
''');
4143
}
4244

45+
@SkippedTest() // TODO(scheglov): implement augmentation
4346
Future<void> test_class_name_augmentationToAugmentation() async {
4447
await verifyGoToAugmentation('''
4548
class A {}
@@ -50,6 +53,7 @@ augment class [!A!] {}
5053
''');
5154
}
5255

56+
@SkippedTest() // TODO(scheglov): implement augmentation
5357
Future<void> test_class_name_declarationToAugmentation() async {
5458
await verifyGoToAugmentation('''
5559
class A^ {}

pkg/analysis_server/test/lsp/augmented_test.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ void main() {
1818

1919
@reflectiveTest
2020
class AugmentedTest extends AbstractLspAnalysisServerTest {
21+
@SkippedTest() // TODO(scheglov): implement augmentation
2122
Future<void> test_class_body_augmentationToAugmentation() async {
2223
await verifyGoToAugmented('''
2324
class A {}
@@ -30,6 +31,7 @@ augment class A {
3031
''');
3132
}
3233

34+
@SkippedTest() // TODO(scheglov): implement augmentation
3335
Future<void> test_class_body_augmentationToDeclaration() async {
3436
await verifyGoToAugmented('''
3537
class [!A!] {}
@@ -40,6 +42,7 @@ augment class A {
4042
''');
4143
}
4244

45+
@SkippedTest() // TODO(scheglov): implement augmentation
4346
Future<void> test_class_name_augmentationToAugmentation() async {
4447
await verifyGoToAugmented('''
4548
class A {}
@@ -50,6 +53,7 @@ augment class A^ {}
5053
''');
5154
}
5255

56+
@SkippedTest() // TODO(scheglov): implement augmentation
5357
Future<void> test_class_name_augmentationToDeclaration() async {
5458
await verifyGoToAugmented('''
5559
class [!A!] {}

pkg/analysis_server/test/lsp/code_lens/augmentations_test.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ $content
139139
setClientSupportedCommands([ClientCommands.goToLocation]);
140140
}
141141

142+
@SkippedTest() // TODO(scheglov): implement augmentation
142143
test_available_class() async {
143144
setLibraryContent(r'''
144145
class [!A!] {}
@@ -199,6 +200,7 @@ augment class A {
199200
await expectNavigationCodeLens();
200201
}
201202

203+
@SkippedTest() // TODO(scheglov): implement augmentation
202204
test_available_enum() async {
203205
setLibraryContent(r'''
204206
enum [!A!] {
@@ -215,6 +217,7 @@ augment enum [!A!] {
215217
await expectNavigationCodeLens();
216218
}
217219

220+
@SkippedTest() // TODO(scheglov): implement augmentation
218221
test_available_enum_member() async {
219222
setLibraryContent(r'''
220223
enum A {
@@ -317,6 +320,7 @@ class AugmentationCodeLensTest extends AbstractAugmentationCodeLensTest {
317320
@override
318321
Uri get targetUri => mainFileAugmentationUri;
319322

323+
@SkippedTest() // TODO(scheglov): implement augmentation
320324
test_available_class_augmentationOf_augmentationOf_declarationInAugmentationFile() async {
321325
setLibraryContent(r'');
322326
setAugmentationContent(r'''
@@ -334,6 +338,7 @@ augment class /*[1*/A/*1]*/ {}
334338
);
335339
}
336340

341+
@SkippedTest() // TODO(scheglov): implement augmentation
337342
test_available_class_augmentationOf_augmentationOf_declarationInLibraryFile() async {
338343
setLibraryContent(r'''
339344
class A {}
@@ -352,6 +357,7 @@ augment class /*[1*/A/*1]*/ {}
352357
);
353358
}
354359

360+
@SkippedTest() // TODO(scheglov): implement augmentation
355361
test_available_class_augmentationOf_declarationInAugmentationFile() async {
356362
setLibraryContent('');
357363
setAugmentationContent(r'''
@@ -393,6 +399,7 @@ class AugmentedCodeLensTest extends AbstractAugmentationCodeLensTest {
393399
@override
394400
Uri get targetUri => mainFileUri;
395401

402+
@SkippedTest() // TODO(scheglov): implement augmentation
396403
test_available_class_augmentationOf_augmentationOf_declarationInAugmentationFile() async {
397404
setLibraryContent(r'');
398405
setAugmentationContent(r'''
@@ -410,6 +417,7 @@ augment class /*[1*/A/*1]*/ {}
410417
);
411418
}
412419

420+
@SkippedTest() // TODO(scheglov): implement augmentation
413421
test_available_class_augmentationOf_augmentationOf_declarationInLibraryFile() async {
414422
setLibraryContent(r'''
415423
class A {}
@@ -428,6 +436,7 @@ augment class /*[1*/A/*1]*/ {}
428436
);
429437
}
430438

439+
@SkippedTest() // TODO(scheglov): implement augmentation
431440
test_available_class_augmentationOf_declarationInAugmentationFile() async {
432441
setLibraryContent('');
433442
setAugmentationContent(r'''

pkg/analysis_server/test/lsp/type_hierarchy_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ import 'main.dart';
179179
);
180180
}
181181

182+
@SkippedTest() // TODO(scheglov): implement augmentation
182183
Future<void> test_augment_extends() async {
183184
var content = '''
184185
part 'other.dart';
@@ -344,6 +345,7 @@ class MyCla^ss2 extends MyClass1 {}
344345
);
345346
}
346347

348+
@SkippedTest() // TODO(scheglov): implement augmentation
347349
Future<void> test_augment_extends() async {
348350
var content = '''
349351
part 'other.dart';

pkg/analyzer/api.txt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,8 +2996,6 @@ package:analyzer/dart/element/element.dart:
29962996
new (constructor: BindPatternVariableElement Function())
29972997
ClassElement (class extends Object implements InterfaceElement):
29982998
new (constructor: ClassElement Function())
2999-
augmentation (getter: ClassElement?, experimental)
3000-
augmentationTarget (getter: ClassElement?, experimental)
30012999
hasNonFinalField (getter: bool)
30023000
isAbstract (getter: bool)
30033001
isBase (getter: bool)
@@ -3042,8 +3040,6 @@ package:analyzer/dart/element/element.dart:
30423040
getEnum (method: EnumElement? Function(String))
30433041
ConstructorElement (class extends Object implements ClassMemberElement, ExecutableElement, ConstantEvaluationTarget):
30443042
new (constructor: ConstructorElement Function())
3045-
augmentation (getter: ConstructorElement?, experimental)
3046-
augmentationTarget (getter: ConstructorElement?, experimental)
30473043
declaration (getter: ConstructorElement)
30483044
displayName (getter: String)
30493045
enclosingElement3 (getter: InterfaceElement)
@@ -3251,12 +3247,8 @@ package:analyzer/dart/element/element.dart:
32513247
visitTypeParameterElement (method: R? Function(TypeParameterElement))
32523248
EnumElement (class extends Object implements InterfaceElement):
32533249
new (constructor: EnumElement Function())
3254-
augmentation (getter: EnumElement?, experimental)
3255-
augmentationTarget (getter: EnumElement?, experimental)
32563250
ExecutableElement (class extends Object implements FunctionTypedElement):
32573251
new (constructor: ExecutableElement Function())
3258-
augmentation (getter: ExecutableElement?, experimental)
3259-
augmentationTarget (getter: ExecutableElement?, experimental)
32603252
declaration (getter: ExecutableElement)
32613253
displayName (getter: String)
32623254
enclosingElement3 (getter: Element)
@@ -3273,24 +3265,18 @@ package:analyzer/dart/element/element.dart:
32733265
name (getter: String)
32743266
ExtensionElement (class extends Object implements InstanceElement):
32753267
new (constructor: ExtensionElement Function())
3276-
augmentation (getter: ExtensionElement?, experimental)
3277-
augmentationTarget (getter: ExtensionElement?, experimental)
32783268
extendedType (getter: DartType)
32793269
getField (method: FieldElement? Function(String))
32803270
getGetter (method: PropertyAccessorElement? Function(String))
32813271
getMethod (method: MethodElement? Function(String))
32823272
getSetter (method: PropertyAccessorElement? Function(String))
32833273
ExtensionTypeElement (class extends Object implements InterfaceElement, experimental):
32843274
new (constructor: ExtensionTypeElement Function())
3285-
augmentation (getter: ExtensionTypeElement?, experimental)
3286-
augmentationTarget (getter: ExtensionTypeElement?, experimental)
32873275
primaryConstructor (getter: ConstructorElement)
32883276
representation (getter: FieldElement)
32893277
typeErasure (getter: DartType)
32903278
FieldElement (class extends Object implements ClassMemberElement, PropertyInducingElement):
32913279
new (constructor: FieldElement Function())
3292-
augmentation (getter: FieldElement?, experimental)
3293-
augmentationTarget (getter: FieldElement?, experimental)
32943280
declaration (getter: FieldElement)
32953281
isAbstract (getter: bool)
32963282
isCovariant (getter: bool)
@@ -3307,8 +3293,6 @@ package:analyzer/dart/element/element.dart:
33073293
MAIN_FUNCTION_NAME (static getter: String)
33083294
NO_SUCH_METHOD_METHOD_NAME (static getter: String)
33093295
new (constructor: FunctionElement Function())
3310-
augmentation (getter: FunctionElement?, experimental)
3311-
augmentationTarget (getter: FunctionElement?, experimental)
33123296
isDartCoreIdentical (getter: bool)
33133297
isEntryPoint (getter: bool)
33143298
FunctionTypedElement (class extends Object implements TypeParameterizedElement):
@@ -3329,8 +3313,6 @@ package:analyzer/dart/element/element.dart:
33293313
InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement):
33303314
new (constructor: InstanceElement Function())
33313315
accessors (getter: List<PropertyAccessorElement>)
3332-
augmentation (getter: InstanceElement?, experimental)
3333-
augmentationTarget (getter: InstanceElement?, experimental)
33343316
enclosingElement3 (getter: CompilationUnitElement)
33353317
fields (getter: List<FieldElement>)
33363318
isAugmentation (getter: bool)
@@ -3339,7 +3321,6 @@ package:analyzer/dart/element/element.dart:
33393321
InterfaceElement (class extends Object implements InstanceElement):
33403322
new (constructor: InterfaceElement Function())
33413323
allSupertypes (getter: List<InterfaceType>)
3342-
augmentationTarget (getter: InterfaceElement?)
33433324
constructors (getter: List<ConstructorElement>)
33443325
interfaces (getter: List<InterfaceType>)
33453326
mixins (getter: List<InterfaceType>)
@@ -3422,13 +3403,9 @@ package:analyzer/dart/element/element.dart:
34223403
name (getter: String)
34233404
MethodElement (class extends Object implements ClassMemberElement, ExecutableElement):
34243405
new (constructor: MethodElement Function())
3425-
augmentation (getter: MethodElement?, experimental)
3426-
augmentationTarget (getter: MethodElement?, experimental)
34273406
declaration (getter: MethodElement)
34283407
MixinElement (class extends Object implements InterfaceElement):
34293408
new (constructor: MixinElement Function())
3430-
augmentation (getter: MixinElement?, experimental)
3431-
augmentationTarget (getter: MixinElement?, experimental)
34323409
isBase (getter: bool)
34333410
superclassConstraints (getter: List<InterfaceType>)
34343411
isImplementableIn (method: bool Function(LibraryElement))
@@ -3475,8 +3452,6 @@ package:analyzer/dart/element/element.dart:
34753452
name (getter: String)
34763453
PropertyAccessorElement (class extends Object implements ExecutableElement):
34773454
new (constructor: PropertyAccessorElement Function())
3478-
augmentation (getter: PropertyAccessorElement?, experimental)
3479-
augmentationTarget (getter: PropertyAccessorElement?, experimental)
34803455
correspondingGetter (getter: PropertyAccessorElement?)
34813456
correspondingSetter (getter: PropertyAccessorElement?)
34823457
declaration (getter: PropertyAccessorElement)
@@ -3486,8 +3461,6 @@ package:analyzer/dart/element/element.dart:
34863461
variable2 (getter: PropertyInducingElement?)
34873462
PropertyInducingElement (class extends Object implements VariableElement):
34883463
new (constructor: PropertyInducingElement Function())
3489-
augmentation (getter: PropertyInducingElement?, experimental)
3490-
augmentationTarget (getter: PropertyInducingElement?, experimental)
34913464
displayName (getter: String)
34923465
getter (getter: PropertyAccessorElement?)
34933466
hasInitializer (getter: bool)
@@ -3505,8 +3478,6 @@ package:analyzer/dart/element/element.dart:
35053478
superConstructorParameter (getter: ParameterElement?)
35063479
TopLevelVariableElement (class extends Object implements PropertyInducingElement):
35073480
new (constructor: TopLevelVariableElement Function())
3508-
augmentation (getter: TopLevelVariableElement?, experimental)
3509-
augmentationTarget (getter: TopLevelVariableElement?, experimental)
35103481
declaration (getter: TopLevelVariableElement)
35113482
isExternal (getter: bool)
35123483
TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement):

0 commit comments

Comments
 (0)