Skip to content

Commit 2afa2e8

Browse files
scheglovCommit Queue
authored andcommitted
Deprecate PartDirective.configurations
Change-Id: I6e9757e531e2f9f46da5bb78ffef7cf694cf7467 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/454321 Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 361917e commit 2afa2e8

File tree

7 files changed

+12
-18
lines changed

7 files changed

+12
-18
lines changed

pkg/analysis_server_plugin/lib/src/utilities/selection.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class _ChildrenFinder extends SimpleAstVisitor<void> {
270270

271271
@override
272272
void visitPartDirective(PartDirective node) {
273-
_fromList(node.metadata) || _fromList(node.configurations);
273+
_fromList(node.metadata);
274274
}
275275

276276
@override

pkg/analyzer/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 8.3.0
22
* Deprecate `TypeDefiningElement`, check for specific elements.
33
* Deprecate `TypeDefiningFragment`, check for specific fragments.
4+
* Deprecate `PartDirective.configurations`, removed from the specification.
45

56
## 8.2.0
67
* Updated SDK constraint to `^3.9.0`.

pkg/analyzer/api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ package:analyzer/dart/ast/ast.dart:
15041504
pattern (getter: DartPattern)
15051505
rightParenthesis (getter: Token)
15061506
PartDirective (class extends Object implements UriBasedDirective):
1507-
configurations (getter: NodeList<Configuration>)
1507+
configurations (getter: NodeList<Configuration>, deprecated)
15081508
partInclude (getter: PartInclude?)
15091509
partKeyword (getter: Token)
15101510
semicolon (getter: Token)

pkg/analyzer/lib/src/dart/analysis/file_state.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ class FileState {
11601160

11611161
static UnlinkedPartDirective _serializePart(PartDirective node) {
11621162
return UnlinkedPartDirective(
1163-
configurations: _serializeConfigurations(node.configurations),
1163+
configurations: [],
11641164
partKeywordOffset: node.partKeyword.offset,
11651165
uri: node.uri.stringValue,
11661166
);

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ class LibraryAnalyzer {
10761076

10771077
if (directive != null) {
10781078
_resolveUriConfigurations(
1079-
configurationNodes: directive.configurations,
1079+
configurationNodes: [],
10801080
configurationUris: partState.uris.configurations,
10811081
);
10821082
}

pkg/analyzer/lib/src/dart/ast/ast.dart

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18179,6 +18179,7 @@ final class ParenthesizedPatternImpl extends DartPatternImpl
1817918179
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
1818018180
abstract final class PartDirective implements UriBasedDirective {
1818118181
/// The configurations that control which file is actually included.
18182+
@Deprecated('Removed from the specification')
1818218183
NodeList<Configuration> get configurations;
1818318184

1818418185
/// Information about this part directive.
@@ -18197,7 +18198,6 @@ abstract final class PartDirective implements UriBasedDirective {
1819718198
childEntitiesOrder: [
1819818199
GenerateNodeProperty('partKeyword'),
1819918200
GenerateNodeProperty('uri', isSuper: true),
18200-
GenerateNodeProperty('configurations'),
1820118201
GenerateNodeProperty('semicolon'),
1820218202
],
1820318203
)
@@ -18207,10 +18207,6 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
1820718207
@override
1820818208
final Token partKeyword;
1820918209

18210-
@generated
18211-
@override
18212-
final NodeListImpl<ConfigurationImpl> configurations = NodeListImpl._();
18213-
1821418210
@generated
1821518211
@override
1821618212
final Token semicolon;
@@ -18225,8 +18221,12 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
1822518221
required this.partKeyword,
1822618222
required super.uri,
1822718223
required this.semicolon,
18228-
}) {
18229-
configurations._initialize(this, null);
18224+
});
18225+
18226+
@Deprecated('Removed from the specification')
18227+
@override
18228+
NodeListImpl<ConfigurationImpl> get configurations {
18229+
return NodeListImpl._().._initialize(this, null);
1823018230
}
1823118231

1823218232
@generated
@@ -18246,7 +18246,6 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
1824618246
ChildEntities get _childEntities => super._childEntities
1824718247
..addToken('partKeyword', partKeyword)
1824818248
..addNode('uri', uri)
18249-
..addNodeList('configurations', configurations)
1825018249
..addToken('semicolon', semicolon);
1825118250

1825218251
@generated
@@ -18258,7 +18257,6 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
1825818257
void visitChildren(AstVisitor visitor) {
1825918258
super.visitChildren(visitor);
1826018259
uri.accept(visitor);
18261-
configurations.accept(visitor);
1826218260
}
1826318261

1826418262
@generated
@@ -18270,10 +18268,6 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
1827018268
if (uri._containsOffset(rangeOffset, rangeEnd)) {
1827118269
return uri;
1827218270
}
18273-
if (configurations._elementContainingRange(rangeOffset, rangeEnd)
18274-
case var result?) {
18275-
return result;
18276-
}
1827718271
return null;
1827818272
}
1827918273
}

pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,6 @@ class ToSourceVisitor implements AstVisitor<void> {
10261026
_visitNodeList(node.metadata, separator: ' ', suffix: ' ');
10271027
sink.write('part ');
10281028
_visitNode(node.uri);
1029-
_visitNodeList(node.configurations, prefix: ' ', separator: ' ');
10301029
sink.write(';');
10311030
}
10321031

0 commit comments

Comments
 (0)