Skip to content

Commit 4159ea7

Browse files
johnniwintherCommit Queue
authored andcommitted
[cfe] Remove support for augmentation libraries
Change-Id: I380173d2e1bc747f7a14eae537a7f1eb80ff4850 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413680 Commit-Queue: Johnni Winther <[email protected]> Reviewed-by: Chloe Stefantsova <[email protected]>
1 parent 4c8aedc commit 4159ea7

File tree

36 files changed

+307
-681
lines changed

36 files changed

+307
-681
lines changed

pkg/front_end/lib/src/base/scope.dart

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,28 +1442,6 @@ abstract class MergedScope<T extends Builder> {
14421442
bool _allowInjectedPublicMember(Builder newBuilder);
14431443
}
14441444

1445-
// Coverage-ignore(suite): Not run.
1446-
class MergedLibraryScope extends MergedScope<SourceLibraryBuilder> {
1447-
MergedLibraryScope(SourceLibraryBuilder origin)
1448-
: super(origin, origin.libraryNameSpace);
1449-
1450-
@override
1451-
SourceLibraryBuilder get originLibrary => _origin;
1452-
1453-
void addAugmentationScope(SourceLibraryBuilder builder) {
1454-
_addAugmentationScope(builder, builder.libraryNameSpace,
1455-
augmentations: builder.augmentations,
1456-
setterAugmentations: builder.setterAugmentations,
1457-
inPatchLibrary: builder.isPatchLibrary);
1458-
}
1459-
1460-
@override
1461-
bool _allowInjectedPublicMember(Builder newBuilder) {
1462-
return originLibrary.importUri.isScheme("dart") &&
1463-
originLibrary.importUri.path.startsWith("_");
1464-
}
1465-
}
1466-
14671445
class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
14681446
final DeclarationNameSpace _originConstructorNameSpace;
14691447
Map<SourceClassBuilder, DeclarationNameSpace>

pkg/front_end/lib/src/source/source_class_builder.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,8 +1403,7 @@ class SourceClassBuilder extends ClassBuilderImpl
14031403
if (member is Field && member.isStatic ||
14041404
member is Procedure && member.isStatic) {
14051405
member.name = new Name(
1406-
'${member.name}'
1407-
'#${memberBuilder.libraryBuilder.augmentationIndex}',
1406+
'${member.name}',
14081407
member.name.library);
14091408
} else {
14101409
return;

pkg/front_end/lib/src/source/source_compilation_unit.dart

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
4343

4444
SourceLibraryBuilder? _libraryBuilder;
4545

46-
/// The object used as the root for creating augmentation libraries.
47-
// TODO(johnniwinther): Remove this once parts support augmentations.
48-
final SourceCompilationUnit? _augmentationRoot;
49-
5046
// TODO(johnniwinther): Can we avoid this?
5147
final bool? _referenceIsPartOwner;
5248

@@ -191,7 +187,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
191187
_libraryNameSpaceBuilder = libraryNameSpaceBuilder,
192188
_importNameSpace = importNameSpace,
193189
_prefixNameSpace = prefixNameSpace,
194-
_augmentationRoot = augmentationRoot,
195190
_nameOrigin = nameOrigin,
196191
_parentScope = parentScope,
197192
_referenceIsPartOwner = referenceIsPartOwner,
@@ -477,8 +472,8 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
477472
"the compilation unit is finalized.");
478473
assert(_libraryBuilder == null,
479474
"Source library builder as already been created for $this.");
480-
SourceLibraryBuilder libraryBuilder =
481-
_libraryBuilder = new SourceLibraryBuilder(
475+
SourceLibraryBuilder libraryBuilder = _libraryBuilder =
476+
new SourceLibraryBuilder(
482477
compilationUnit: this,
483478
importUri: importUri,
484479
fileUri: fileUri,
@@ -487,9 +482,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
487482
packageLanguageVersion: packageLanguageVersion,
488483
loader: loader,
489484
nameOrigin: _nameOrigin,
490-
origin: _augmentationRoot
491-
// Coverage-ignore(suite): Not run.
492-
?.libraryBuilder,
493485
target: library,
494486
indexedLibrary: indexedLibrary,
495487
referenceIsPartOwner: _referenceIsPartOwner,

0 commit comments

Comments
 (0)