Parts. Rename to PartIncludeState.
Change-Id: If48156d9b67958b79616e00b613884d50182dced
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/376741
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/analysis/file_state.dart b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
index 6bbe3cc..cbde2e8 100644
--- a/pkg/analyzer/lib/src/dart/analysis/file_state.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
@@ -346,8 +346,8 @@
List<AugmentationImportState>? _augmentationImports;
List<LibraryExportState>? _libraryExports;
List<LibraryImportState>? _libraryImports;
+ List<PartIncludeState>? _partIncludes;
List<LibraryImportState>? _docImports;
- List<PartState>? _parts;
FileKind({
required this.file,
@@ -485,30 +485,31 @@
return _libraryImports = result;
}
- List<PartState> get parts {
- return _parts ??= file.unlinked2.parts.map<PartState>((unlinked) {
+ List<PartIncludeState> get partIncludes {
+ return _partIncludes ??=
+ file.unlinked2.parts.map<PartIncludeState>((unlinked) {
var uri = file._buildDirectiveUri(unlinked.uri);
switch (uri) {
case DirectiveUriWithFile():
- return PartWithFile(
+ return PartIncludeWithFile(
container: this,
unlinked: unlinked,
uri: uri,
);
case DirectiveUriWithUri():
- return PartWithUri(
+ return PartIncludeWithUri(
container: this,
unlinked: unlinked,
uri: uri,
);
case DirectiveUriWithString():
- return PartWithUriStr(
+ return PartIncludeWithUriStr(
container: this,
unlinked: unlinked,
uri: uri,
);
case DirectiveUriWithoutString():
- return PartState(
+ return PartIncludeState(
container: this,
unlinked: unlinked,
uri: uri,
@@ -523,24 +524,24 @@
@mustCallSuper
void collectTransitive(Set<FileState> files) {
if (files.add(file)) {
- for (var augmentation in augmentationImports) {
- if (augmentation is AugmentationImportWithFile) {
- augmentation.importedAugmentation?.collectTransitive(files);
+ for (var directive in augmentationImports) {
+ if (directive is AugmentationImportWithFile) {
+ directive.importedAugmentation?.collectTransitive(files);
}
}
- for (var export in libraryExports) {
- if (export is LibraryExportWithFile) {
- export.exportedLibrary?.collectTransitive(files);
+ for (var directive in libraryExports) {
+ if (directive is LibraryExportWithFile) {
+ directive.exportedLibrary?.collectTransitive(files);
}
}
- for (var import in libraryImports) {
- if (import is LibraryImportWithFile) {
- import.importedLibrary?.collectTransitive(files);
+ for (var directive in libraryImports) {
+ if (directive is LibraryImportWithFile) {
+ directive.importedLibrary?.collectTransitive(files);
}
}
- for (var part in parts) {
- if (part is PartWithFile) {
- part.includedPart?.collectTransitive(files);
+ for (var directive in partIncludes) {
+ if (directive is PartIncludeWithFile) {
+ directive.includedPart?.collectTransitive(files);
}
}
}
@@ -555,7 +556,7 @@
augmentationImports;
libraryExports;
libraryImports;
- parts;
+ partIncludes;
docImports;
}
@@ -564,7 +565,7 @@
_augmentationImports?.disposeAll();
_libraryExports?.disposeAll();
_libraryImports?.disposeAll();
- _parts?.disposeAll();
+ _partIncludes?.disposeAll();
_docImports?.disposeAll();
}
@@ -580,9 +581,9 @@
}
bool hasPart(PartFileKind partKind) {
- for (var partDirective in parts) {
- if (partDirective is PartWithFile) {
- if (partDirective.includedFile == partKind.file) {
+ for (var directive in partIncludes) {
+ if (directive is PartIncludeWithFile) {
+ if (directive.includedFile == partKind.file) {
return true;
}
}
@@ -2170,9 +2171,9 @@
void visitParts(FileKind kind) {
result.add(kind);
- for (var part in kind.parts) {
- if (part is PartWithFile) {
- var includedPart = part.includedPart;
+ for (var directive in kind.partIncludes) {
+ if (directive is PartIncludeWithFile) {
+ var includedPart = directive.includedPart;
if (includedPart != null) {
visitParts(includedPart);
}
@@ -2526,6 +2527,67 @@
}
}
+/// Information about a single `part` directive.
+final class PartIncludeState<U extends DirectiveUri> extends DirectiveState {
+ final UnlinkedPartDirective unlinked;
+ final U uri;
+
+ PartIncludeState({
+ required super.container,
+ required this.unlinked,
+ required this.uri,
+ });
+}
+
+/// [PartIncludeWithUri] that has a valid URI that references a file.
+final class PartIncludeWithFile
+ extends PartIncludeWithUri<DirectiveUriWithFile> {
+ PartIncludeWithFile({
+ required super.container,
+ required super.unlinked,
+ required super.uri,
+ }) {
+ includedFile.referencingFiles.add(container.file);
+ }
+
+ FileState get includedFile => uri.file;
+
+ /// If [includedFile] is a [PartFileKind], and it confirms that it
+ /// is a part of the [container], returns the [includedFile].
+ PartFileKind? get includedPart {
+ var kind = includedFile.kind;
+ if (kind is PartFileKind && kind.isPartOf(container)) {
+ return kind;
+ }
+ return null;
+ }
+
+ @override
+ void dispose() {
+ includedFile.referencingFiles.remove(container.file);
+ }
+}
+
+/// [PartIncludeState] that has a valid URI.
+final class PartIncludeWithUri<U extends DirectiveUriWithUri>
+ extends PartIncludeWithUriStr<U> {
+ PartIncludeWithUri({
+ required super.container,
+ required super.unlinked,
+ required super.uri,
+ });
+}
+
+/// [PartIncludeState] that has a relative URI string.
+final class PartIncludeWithUriStr<U extends DirectiveUriWithString>
+ extends PartIncludeState<U> {
+ PartIncludeWithUriStr({
+ required super.container,
+ required super.unlinked,
+ required super.uri,
+ });
+}
+
/// The file has `part of name` directive.
class PartOfNameFileKind extends PartFileKind {
final UnlinkedPartOfNameDirective unlinked;
@@ -2662,66 +2724,6 @@
bool isPartOf(FileKind container) => false;
}
-/// Information about a single `part` directive.
-final class PartState<U extends DirectiveUri> extends DirectiveState {
- final UnlinkedPartDirective unlinked;
- final U uri;
-
- PartState({
- required super.container,
- required this.unlinked,
- required this.uri,
- });
-}
-
-/// [PartWithUri] that has a valid URI that references a file.
-final class PartWithFile extends PartWithUri<DirectiveUriWithFile> {
- PartWithFile({
- required super.container,
- required super.unlinked,
- required super.uri,
- }) {
- includedFile.referencingFiles.add(container.file);
- }
-
- FileState get includedFile => uri.file;
-
- /// If [includedFile] is a [PartFileKind], and it confirms that it
- /// is a part of the [container], returns the [includedFile].
- PartFileKind? get includedPart {
- var kind = includedFile.kind;
- if (kind is PartFileKind && kind.isPartOf(container)) {
- return kind;
- }
- return null;
- }
-
- @override
- void dispose() {
- includedFile.referencingFiles.remove(container.file);
- }
-}
-
-/// [PartState] that has a valid URI.
-final class PartWithUri<U extends DirectiveUriWithUri>
- extends PartWithUriStr<U> {
- PartWithUri({
- required super.container,
- required super.unlinked,
- required super.uri,
- });
-}
-
-/// [PartState] that has a relative URI string.
-final class PartWithUriStr<U extends DirectiveUriWithString>
- extends PartState<U> {
- PartWithUriStr({
- required super.container,
- required super.unlinked,
- required super.uri,
- });
-}
-
class StoredFileContent implements FileContent {
@override
final String content;
diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
index 96bfecb..c6d7648 100644
--- a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
@@ -819,7 +819,7 @@
var index = partIndex++;
_resolvePartDirective(
directive: directive,
- partState: containerKind.parts[index],
+ partState: containerKind.partIncludes[index],
partElement: containerElement.parts[index],
errorReporter: containerErrorReporter,
libraryNameNode: libraryNameNode,
@@ -1074,7 +1074,7 @@
void _resolvePartDirective({
required PartDirectiveImpl directive,
- required PartState partState,
+ required PartIncludeState partState,
required PartElementImpl partElement,
required ErrorReporter errorReporter,
required LibraryIdentifier? libraryNameNode,
@@ -1084,7 +1084,7 @@
directive.element = partElement;
- if (partState is! PartWithUriStr) {
+ if (partState is! PartIncludeWithUriStr) {
errorReporter.atNode(
directive.uri,
CompileTimeErrorCode.URI_WITH_INTERPOLATION,
@@ -1092,7 +1092,7 @@
return;
}
- if (partState is! PartWithUri) {
+ if (partState is! PartIncludeWithUri) {
errorReporter.atNode(
directive.uri,
CompileTimeErrorCode.INVALID_URI,
@@ -1101,7 +1101,7 @@
return;
}
- if (partState is! PartWithFile) {
+ if (partState is! PartIncludeWithFile) {
errorReporter.atNode(
directive.uri,
CompileTimeErrorCode.URI_DOES_NOT_EXIST,
diff --git a/pkg/analyzer/lib/src/summary2/library_builder.dart b/pkg/analyzer/lib/src/summary2/library_builder.dart
index 8b5b82d..40e14f7 100644
--- a/pkg/analyzer/lib/src/summary2/library_builder.dart
+++ b/pkg/analyzer/lib/src/summary2/library_builder.dart
@@ -1352,10 +1352,10 @@
libraryElement.definingCompilationUnit = unitElement;
}
- libraryElement.parts = inputLibrary.parts.map((partState) {
+ libraryElement.parts = inputLibrary.partIncludes.map((partState) {
var uriState = partState.uri;
DirectiveUri directiveUri;
- if (partState is PartWithFile) {
+ if (partState is PartIncludeWithFile) {
var includedPart = partState.includedPart;
if (includedPart != null) {
var partFile = includedPart.file;
diff --git a/pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart b/pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart
index 5632d52..f54deed 100644
--- a/pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart
+++ b/pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart
@@ -263,7 +263,7 @@
_writeLibraryImports(kind);
_writeLibraryExports(kind);
_writeAugmentationImports(kind);
- _writeParts(kind);
+ _writePartIncludes(kind);
_writeDocImports(kind);
var filesIds = kind.files.map(idProvider.fileState);
@@ -292,7 +292,7 @@
_writeLibraryImports(kind);
_writeLibraryExports(kind);
- _writeParts(kind);
+ _writePartIncludes(kind);
_writeDocImports(kind);
});
} else if (kind is PartOfUriKnownFileKind) {
@@ -307,7 +307,7 @@
_writeLibraryImports(kind);
_writeLibraryExports(kind);
- _writeParts(kind);
+ _writePartIncludes(kind);
_writeDocImports(kind);
});
} else if (kind is PartOfUriUnknownFileKind) {
@@ -639,28 +639,32 @@
sink.writeln(line);
}
- void _writeParts(FileKind container) {
- _writeElements<PartState>('parts', container.parts, (part) {
- expect(part.container, same(container));
- if (part is PartWithFile) {
- var file = part.includedFile;
- sink.write(_indent);
+ void _writePartIncludes(FileKind container) {
+ _writeElements<PartIncludeState>(
+ 'partIncludes',
+ container.partIncludes,
+ (part) {
+ expect(part.container, same(container));
+ if (part is PartIncludeWithFile) {
+ var file = part.includedFile;
+ sink.write(_indent);
- var includedPart = part.includedPart;
- if (includedPart != null) {
- expect(includedPart.file, file);
- sink.write(idProvider.fileKind(includedPart));
+ var includedPart = part.includedPart;
+ if (includedPart != null) {
+ expect(includedPart.file, file);
+ sink.write(idProvider.fileKind(includedPart));
+ } else {
+ sink.write('notPart ${idProvider.fileState(file)}');
+ }
+ sink.writeln();
+ } else if (part is PartIncludeWithUri) {
+ var uriStr = _stringOfUriStr(part.uri.relativeUriStr);
+ _writelnWithIndent('uri: $uriStr');
} else {
- sink.write('notPart ${idProvider.fileState(file)}');
+ _writelnWithIndent('noUri');
}
- sink.writeln();
- } else if (part is PartWithUri) {
- var uriStr = _stringOfUriStr(part.uri.relativeUriStr);
- _writelnWithIndent('uri: $uriStr');
- } else {
- _writelnWithIndent('noUri');
- }
- });
+ },
+ );
}
void _writeReferencingFiles(FileState file) {
diff --git a/pkg/analyzer/test/src/dart/analysis/file_state_test.dart b/pkg/analyzer/test/src/dart/analysis/file_state_test.dart
index 9cad7ff..560dfa6 100644
--- a/pkg/analyzer/test/src/dart/analysis/file_state_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/file_state_test.dart
@@ -2847,7 +2847,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_0
@@ -2884,7 +2884,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_3
@@ -2927,7 +2927,7 @@
kind: library_0
libraryImports
library_1 dart:core synthetic
- parts
+ partIncludes
notPart file_0
files: file_0
cycle_0
@@ -2957,7 +2957,7 @@
kind: library_0
libraryImports
library_1 dart:core synthetic
- parts
+ partIncludes
uri: da:
files: file_0
cycle_0
@@ -2986,7 +2986,7 @@
kind: library_0
libraryImports
library_1 dart:core synthetic
- parts
+ partIncludes
noUri
files: file_0
cycle_0
@@ -3044,7 +3044,7 @@
kind: library_2
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_0
partOfUriKnown_1
files: file_2 file_0 file_1
@@ -3090,7 +3090,7 @@
kind: library_2
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_8
partOfUriKnown_1
files: file_2 file_0 file_1
@@ -3136,7 +3136,7 @@
kind: library_2
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_8
partOfUriKnown_9
files: file_2 file_0 file_1
@@ -3253,7 +3253,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_0
files: file_1 file_0
cycle_0
@@ -3289,7 +3289,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_0
@@ -3324,7 +3324,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_0
@@ -3371,7 +3371,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_0
@@ -3421,7 +3421,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_0
@@ -3455,7 +3455,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_0
@@ -3471,7 +3471,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_2
@@ -3504,7 +3504,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_0
@@ -3520,7 +3520,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_3
@@ -3553,7 +3553,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_4
@@ -3569,7 +3569,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_3
@@ -3616,7 +3616,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_3
@@ -3708,7 +3708,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_7
@@ -3745,7 +3745,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_0 file_1
cycle_8
@@ -3761,7 +3761,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_7 file_1
cycle_7
@@ -3805,7 +3805,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -3888,7 +3888,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_2
@@ -3920,7 +3920,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_8
files: file_0 file_1
cycle_3
@@ -3964,7 +3964,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -3996,7 +3996,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_7
files: file_0 file_1
cycle_2
@@ -4083,7 +4083,7 @@
library_2 dart:core synthetic
libraryExports
library_6 dart:collection
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -4132,7 +4132,7 @@
libraryImports
library_6 dart:collection
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -4193,7 +4193,7 @@
kind: library_1
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_0
files: file_1
cycle_0
@@ -4240,7 +4240,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1 file_2
cycle_0
@@ -4255,7 +4255,7 @@
kind: partOfUriKnown_1
uriFile: file_0
library: library_0
- parts
+ partIncludes
partOfUriKnown_2
referencingFiles: file_0
unlinkedKey: k01
@@ -4300,7 +4300,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -4332,7 +4332,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -4347,7 +4347,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_2
@@ -4379,7 +4379,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -4394,7 +4394,7 @@
kind: library_8
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_3
@@ -4426,7 +4426,7 @@
kind: library_9
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_4
@@ -4441,7 +4441,7 @@
kind: library_8
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_3
@@ -4488,7 +4488,7 @@
kind: library_8
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_3
@@ -4577,7 +4577,7 @@
kind: library_12
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_7
@@ -4611,7 +4611,7 @@
kind: library_13
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_8
@@ -4626,7 +4626,7 @@
kind: library_12
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_7
cycle_7
@@ -4994,7 +4994,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_7
files: file_0 file_1
cycle_4
@@ -5143,7 +5143,7 @@
kind: library_9
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_7
files: file_0 file_1
cycle_4
@@ -5313,7 +5313,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -5367,7 +5367,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_3
@@ -5452,7 +5452,7 @@
name: my
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfName_0
partOfName_1
files: file_2 file_0 file_1
@@ -5499,7 +5499,7 @@
name: my
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfName_1
files: file_2 file_1
cycle_2
@@ -5556,7 +5556,7 @@
kind: library_2
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_0
partOfUriKnown_1
files: file_2 file_0 file_1
@@ -5602,7 +5602,7 @@
name: my
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_2 file_1
cycle_2
@@ -5722,7 +5722,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_0
@@ -5765,7 +5765,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_7
files: file_0 file_1
cycle_3
@@ -5855,7 +5855,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_0
@@ -5898,7 +5898,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_7
files: file_0 file_1
cycle_3
@@ -5957,7 +5957,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_0
files: file_1 file_0
cycle_0
@@ -5990,7 +5990,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_0
files: file_1 file_0
cycle_0
@@ -6006,7 +6006,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_0
files: file_7 file_0
cycle_2
@@ -6047,7 +6047,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_8
files: file_1 file_0
cycle_3
@@ -6063,7 +6063,7 @@
name: my.lib
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfName_8
files: file_7 file_0
cycle_4
@@ -6101,7 +6101,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1 file_2
cycle_0
@@ -6116,7 +6116,7 @@
kind: partOfUriKnown_1
uriFile: file_0
library: library_0
- parts
+ partIncludes
partOfUriKnown_2
referencingFiles: file_0
unlinkedKey: k01
@@ -6148,7 +6148,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1 file_2
cycle_2
@@ -6163,7 +6163,7 @@
kind: partOfUriKnown_1
uriFile: file_0
library: library_0
- parts
+ partIncludes
partOfUriKnown_8
referencingFiles: file_0
unlinkedKey: k01
@@ -6202,7 +6202,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -6240,7 +6240,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_1
files: file_0
cycle_2
@@ -6300,7 +6300,7 @@
kind: library_1
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_0
files: file_1 file_0
cycle_0
@@ -6331,7 +6331,7 @@
kind: library_1
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_0
files: file_1 file_0
cycle_0
@@ -6346,7 +6346,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_0
files: file_7
cycle_2
@@ -6387,7 +6387,7 @@
kind: library_1
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_8
files: file_1 file_0
cycle_3
@@ -6402,7 +6402,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
notPart file_0
files: file_7
cycle_4
diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
index aa6bcd9..92d5582 100644
--- a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
+++ b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
@@ -548,7 +548,7 @@
kind: library_0
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -618,7 +618,7 @@
kind: library_7
libraryImports
library_2 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_8
files: file_7 file_8
cycle_2
@@ -682,7 +682,7 @@
kind: library_0
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_1
files: file_0 file_1
cycle_0
@@ -783,7 +783,7 @@
kind: library_8
libraryImports
library_3 dart:core synthetic
- parts
+ partIncludes
partOfUriKnown_9
files: file_8 file_9
cycle_3
