Parts. Remove isAugmentation, rename isMacroAugmentation to isMacroPart.
Change-Id: Ibf60f8d20f304a15ff9b2049788a3775fc09686d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/383922
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart
index 4fe02d5..e3c45d9 100644
--- a/pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart
+++ b/pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart
@@ -146,9 +146,8 @@
content: content,
uri: optionsFile.toUri(),
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
@@ -274,9 +273,8 @@
content: content,
uri: pubspecFile.toUri(),
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart
index ce3d324..be3405f 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart
@@ -140,9 +140,8 @@
content: file.readAsStringSync(),
uri: server.uriConverter.toClientUri(path),
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
diff --git a/pkg/analyzer/lib/dart/analysis/results.dart b/pkg/analyzer/lib/dart/analysis/results.dart
index 9bb58d9..c0a57aa 100644
--- a/pkg/analyzer/lib/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/dart/analysis/results.dart
@@ -95,20 +95,25 @@
/// The file resource.
File get file;
- /// Whether the file is a library augmentation.
- /// When `true`, [isLibrary] and [isPart] are `false`.
- bool get isAugmentation;
-
/// Whether the file is a library.
- /// When `true`, [isAugmentation] and [isPart] are `false`.
+ ///
+ /// A file can't be both a library and a part, so when this getter returns
+ /// `true`, the getters [isPart] and [isMacroPart] return `false`.
bool get isLibrary;
- /// Whether the file is a macro augmentation.
- /// When `true`, [isAugmentation] is also `true`.
- bool get isMacroAugmentation;
+ /// Whether the file is a macro part.
+ ///
+ /// A macro part is a part, so when this getter returns `true`, [isPart]
+ /// also results `true`.
+ ///
+ /// A file can't be both a library and a part, so when this getter returns
+ /// `true`, the getter [isLibrary] returns `false`.
+ bool get isMacroPart;
/// Whether the file is a part.
- /// When `true`, [isAugmentation] and [isLibrary] are `false`.
+ ///
+ /// A file can't be both a library and a part, so when this getter returns
+ /// `true`, the getter [isLibrary] returns `false`.
bool get isPart;
/// Information about lines in the content.
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index a49850e..9734c2e 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -1573,9 +1573,8 @@
content: file.content,
lineInfo: file.lineInfo,
uri: file.uri,
- isAugmentation: false,
isLibrary: file.kind is LibraryFileKind,
- isMacroAugmentation: file.isMacroPart,
+ isMacroPart: file.isMacroPart,
isPart: file.kind is PartFileKind,
errors: errors,
analysisOptions: file.analysisOptions,
@@ -1925,9 +1924,8 @@
content: file.content,
lineInfo: file.lineInfo,
uri: file.uri,
- isAugmentation: false,
isLibrary: file.kind is LibraryFileKind,
- isMacroAugmentation: file.isMacroPart,
+ isMacroPart: file.isMacroPart,
isPart: file.kind is PartFileKind,
errors: [
AnalysisError.tmp(
diff --git a/pkg/analyzer/lib/src/dart/analysis/results.dart b/pkg/analyzer/lib/src/dart/analysis/results.dart
index 78c193c..7351e6eb 100644
--- a/pkg/analyzer/lib/src/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/results.dart
@@ -169,13 +169,10 @@
final List<AnalysisError> errors;
@override
- final bool isAugmentation;
-
- @override
final bool isLibrary;
@override
- final bool isMacroAugmentation;
+ final bool isMacroPart;
@override
final bool isPart;
@@ -204,9 +201,8 @@
required this.content,
required this.uri,
required this.lineInfo,
- required this.isAugmentation,
required this.isLibrary,
- required this.isMacroAugmentation,
+ required this.isMacroPart,
required this.isPart,
required this.errors,
required this.analysisOptions,
@@ -226,9 +222,6 @@
final LineInfo lineInfo;
@override
- final bool isAugmentation;
-
- @override
final bool isLibrary;
@override
@@ -239,7 +232,6 @@
required this.fileState,
}) : content = fileState.content,
lineInfo = fileState.lineInfo,
- isAugmentation = false,
isLibrary = fileState.kind is LibraryFileKind,
isPart = fileState.kind is PartFileKind;
@@ -250,7 +242,7 @@
File get file => fileState.resource;
@override
- bool get isMacroAugmentation {
+ bool get isMacroPart {
return fileState.isMacroPart;
}
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index ea44e25..7b2e9c2 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -348,9 +348,8 @@
content: file.content,
uri: file.uri,
lineInfo: file.lineInfo,
- isAugmentation: false,
isLibrary: file.kind is LibraryFileKind,
- isMacroAugmentation: file.isMacroPart,
+ isMacroPart: file.isMacroPart,
isPart: file.kind is PartFileKind,
errors: errors,
analysisOptions: file.analysisOptions,
diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
index c923b52..380812f 100644
--- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart
@@ -275,7 +275,7 @@
ResolvedUnitResult #1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -935,7 +935,7 @@
ResolvedUnitResult #1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -1015,7 +1015,7 @@
ResolvedUnitResult #1
path: /home/test/lib/b.macro.dart
uri: package:test/b.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/b.dart';
@@ -1048,7 +1048,7 @@
ResolvedUnitResult #3
path: /home/test/lib/b.macro.dart
uri: package:test/b.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/b.dart';
@@ -1125,7 +1125,7 @@
ResolvedUnitResult #1
path: /home/test/lib/b.macro.dart
uri: package:test/b.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/b.dart';
@@ -1162,7 +1162,7 @@
ErrorsResult #3
path: /home/test/lib/b.macro.dart
uri: package:test/b.macro.dart
- flags: isMacroAugmentation isPart
+ flags: isMacroPart isPart
content
---
part of 'package:test/b.dart';
@@ -1904,7 +1904,7 @@
ErrorsResult #1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: isMacroAugmentation isPart
+ flags: isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -1915,7 +1915,7 @@
ResolvedUnitResult #2
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -2377,7 +2377,7 @@
ResolvedUnitResult #1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -2745,7 +2745,7 @@
ResolvedUnitResult #2
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -2935,7 +2935,7 @@
ResolvedUnitResult #2
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -3247,7 +3247,7 @@
ResolvedUnitResult #1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/a.dart';
@@ -3739,7 +3739,7 @@
[future] getUnitElement AM1
path: /home/test/lib/a.macro.dart
uri: package:test/a.macro.dart
- flags: isMacroAugmentation isPart
+ flags: isMacroPart isPart
enclosing: package:test/a.dart::<fragment>
selectedElements
package:test/a.dart::@fragment::package:test/a.macro.dart::@class::B
@@ -6085,10 +6085,10 @@
extension on DriverEventsPrinterConfiguration {
void withMacroFileContent() {
errorsConfiguration.withContentPredicate = (result) {
- return result.isMacroAugmentation;
+ return result.isMacroPart;
};
libraryConfiguration.unitConfiguration.withContentPredicate = (result) {
- return result.isMacroAugmentation;
+ return result.isMacroPart;
};
}
}
diff --git a/pkg/analyzer/test/src/dart/analysis/result_printer.dart b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
index 4cd0fba..473642d 100644
--- a/pkg/analyzer/test/src/dart/analysis/result_printer.dart
+++ b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
@@ -63,9 +63,8 @@
sink.writelnWithIndent('uri: ${result.uri}');
sink.writeFlags({
- 'isAugmentation': result.isAugmentation,
'isLibrary': result.isLibrary,
- 'isMacroAugmentation': result.isMacroAugmentation,
+ 'isMacroPart': result.isMacroPart,
'isPart': result.isPart,
});
@@ -273,9 +272,8 @@
sink.writelnWithIndent('uri: ${result.uri}');
sink.writeFlags({
- 'isAugmentation': result.isAugmentation,
'isLibrary': result.isLibrary,
- 'isMacroAugmentation': result.isMacroAugmentation,
+ 'isMacroPart': result.isMacroPart,
'isPart': result.isPart,
});
@@ -535,9 +533,8 @@
sink.writeFlags({
'exists': result.exists,
- 'isAugmentation': result.isAugmentation,
'isLibrary': result.isLibrary,
- 'isMacroAugmentation': result.isMacroAugmentation,
+ 'isMacroPart': result.isMacroPart,
'isPart': result.isPart,
});
diff --git a/pkg/analyzer/test/src/dart/resolution/macro_test.dart b/pkg/analyzer/test/src/dart/resolution/macro_test.dart
index 88b2204..394edfd 100644
--- a/pkg/analyzer/test/src/dart/resolution/macro_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/macro_test.dart
@@ -811,7 +811,7 @@
// into a library augmentation.
assertResolvedLibraryResultText(result, configure: (configuration) {
configuration.unitConfiguration.withContentPredicate = (unitResult) {
- return unitResult.isMacroAugmentation;
+ return unitResult.isMacroPart;
};
}, r'''
ResolvedLibraryResult #0
@@ -826,7 +826,7 @@
ResolvedUnitResult #2
path: /home/test/lib/test.macro.dart
uri: package:test/test.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/test.dart';
@@ -1060,7 +1060,7 @@
ResolvedUnitResult #2
path: /home/test/lib/test.macro.dart
uri: package:test/test.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
''');
}
@@ -1085,13 +1085,13 @@
assertResolvedLibraryResultText(result, configure: (configuration) {
configuration.unitConfiguration
..nodeSelector = (unitResult) {
- if (unitResult.isMacroAugmentation) {
+ if (unitResult.isMacroPart) {
return unitResult.findNode.namedType('NotType');
}
return null;
}
..withContentPredicate = (unitResult) {
- return unitResult.isMacroAugmentation;
+ return unitResult.isMacroPart;
};
}, r'''
ResolvedLibraryResult #0
@@ -1104,7 +1104,7 @@
ResolvedUnitResult #2
path: /home/test/lib/test.macro.dart
uri: package:test/test.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/test.dart';
@@ -1152,7 +1152,7 @@
return null;
}
..withContentPredicate = (unitResult) {
- return unitResult.isMacroAugmentation;
+ return unitResult.isMacroPart;
};
}, r'''
ResolvedLibraryResult #0
@@ -1175,7 +1175,7 @@
ResolvedUnitResult #2
path: /home/test/lib/test.macro.dart
uri: package:test/test.macro.dart
- flags: exists isMacroAugmentation isPart
+ flags: exists isMacroPart isPart
content
---
part of 'package:test/test.dart';
diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart
index 27234ff..4d12a29 100644
--- a/pkg/analyzer_cli/lib/src/driver.dart
+++ b/pkg/analyzer_cli/lib/src/driver.dart
@@ -270,9 +270,8 @@
content: content,
uri: pathContext.toUri(path),
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
@@ -316,9 +315,8 @@
content: content,
uri: pathContext.toUri(path),
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
@@ -346,9 +344,8 @@
content: content,
uri: pathContext.toUri(path),
lineInfo: lineInfo,
- isAugmentation: false,
- isMacroAugmentation: false,
isLibrary: true,
+ isMacroPart: false,
isPart: false,
errors: errors,
analysisOptions: analysisOptions,
diff --git a/pkg/analyzer_cli/test/reporter_test.dart b/pkg/analyzer_cli/test/reporter_test.dart
index 6bdd432..3b13615 100644
--- a/pkg/analyzer_cli/test/reporter_test.dart
+++ b/pkg/analyzer_cli/test/reporter_test.dart
@@ -119,9 +119,8 @@
content: '<mock>',
uri: uri,
lineInfo: lineInfo,
- isAugmentation: false,
isLibrary: true,
- isMacroAugmentation: false,
+ isMacroPart: false,
isPart: false,
errors: [error],
analysisOptions: AnalysisOptionsImpl(),
