Skip to content

Commit 68058cf

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
DeCo. Deprecate NamedCompilationUnitMember.
Bug: #61701 Change-Id: I6de6874d27423d466d8bb5a5a75a8c26518fa557 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/462562 Reviewed-by: Samuel Rawlins <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 4c7f0c1 commit 68058cf

30 files changed

+419
-253
lines changed

‎pkg/analysis_server/lib/src/cider/rename.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ class CheckNameResponse {
376376
}
377377

378378
var node = result.node;
379-
if (node is! NamedCompilationUnitMember) {
379+
if (node is! CompilationUnitMember) {
380380
return null;
381381
}
382382
var edit = await buildEditForInsertedConstructor(

‎pkg/analysis_server/lib/src/computer/computer_hover.dart‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,21 +200,26 @@ class DartUnitHoverComputer {
200200
PrefixExpression() => node.operator,
201201
PostfixExpression() => node.operator,
202202
CatchClauseParameter() => node.name,
203-
NamedCompilationUnitMember() => node.name,
203+
ClassDeclaration() => node.namePart.typeName,
204+
ConstructorDeclaration() => node.name ?? node.returnType,
205+
DeclaredIdentifier() => node.name,
206+
EnumDeclaration() => node.namePart.typeName,
204207
Expression() => node,
205208
ExtensionDeclaration() => node.name,
209+
ExtensionTypeDeclaration() => node.primaryConstructor.typeName,
206210
FormalParameter() => node.name,
211+
FunctionDeclaration() => node.name,
212+
ImportPrefixReference() => node.name,
213+
LibraryDirective() => node.libraryKeyword,
207214
MethodDeclaration() => node.name,
208-
NamedType() => node.name,
215+
MixinDeclaration() => node.name,
209216
NameWithTypeParameters() => node.typeName,
210-
ConstructorDeclaration() => node.name ?? node.returnType,
211-
DeclaredIdentifier() => node.name,
217+
NamedType() => node.name,
218+
PatternFieldName() => node.name,
219+
TypeAlias() => node.name,
212220
VariableDeclaration() => node.name,
213221
VariablePattern() => node.name,
214-
PatternFieldName() => node.name,
215222
WildcardPattern() => node.name,
216-
LibraryDirective() => node.libraryKeyword,
217-
ImportPrefixReference() => node.name,
218223
_ => null,
219224
};
220225
}

‎pkg/analysis_server/lib/src/services/correction/dart/add_class_modifier.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ class AddClassModifier extends ResolvedCorrectionProducer {
5555
Future<void> compute(ChangeBuilder builder) async {
5656
var node = this.node;
5757

58-
var declaration =
59-
node.ifTypeOrNull<NamedCompilationUnitMember>() ?? node.parent;
60-
if (declaration is! NamedCompilationUnitMember) return;
58+
var declaration = node.ifTypeOrNull<CompilationUnitMember>() ?? node.parent;
59+
if (declaration is! CompilationUnitMember) return;
6160

6261
await builder.addDartFileEdit(file, (builder) {
6362
builder.addSimpleInsertion(

‎pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,11 @@ class CreateConstructor extends ResolvedCorrectionProducer {
100100
}
101101

102102
await _write(
103-
builder,
104-
resolvedUnit,
105-
name,
106-
targetNode,
103+
builder: builder,
104+
resolvedUnit: resolvedUnit,
105+
name: name,
106+
unitMember: targetNode,
107+
unitMemberName: targetNode.namePart.typeName,
107108
constructorName: name,
108109
argumentList: argumentList,
109110
);
@@ -258,21 +259,23 @@ class CreateConstructor extends ResolvedCorrectionProducer {
258259
'${targetNode.namePart.typeName.lexeme}${arguments?.constructorSelector ?? ''}';
259260

260261
await _write(
261-
builder,
262-
resolvedUnit,
263-
name,
264-
targetNode,
262+
builder: builder,
263+
resolvedUnit: resolvedUnit,
264+
name: name,
265+
unitMember: targetNode,
266+
unitMemberName: targetNode.namePart.typeName,
265267
isConst: true,
266268
constructorName: arguments?.constructorSelector?.name.token,
267269
argumentList: arguments?.argumentList,
268270
);
269271
}
270272

271-
Future<void> _write(
272-
ChangeBuilder builder,
273-
ResolvedUnitResult resolvedUnit,
274-
Token name,
275-
NamedCompilationUnitMember unitMember, {
273+
Future<void> _write({
274+
required ChangeBuilder builder,
275+
required ResolvedUnitResult resolvedUnit,
276+
required Token name,
277+
required CompilationUnitMember unitMember,
278+
required Token unitMemberName,
276279
Token? constructorName,
277280
bool isConst = false,
278281
ArgumentList? argumentList,
@@ -281,7 +284,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
281284
await builder.addDartFileEdit(targetFile, (builder) {
282285
builder.insertConstructor(unitMember, (builder) {
283286
builder.writeConstructorDeclaration(
284-
unitMember.name.lexeme,
287+
unitMemberName.lexeme,
285288
isConst: isConst,
286289
argumentList: argumentList,
287290
constructorName: constructorName?.lexeme,

‎pkg/analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
5555
}
5656

5757
var container = fieldDeclaration.parent?.parent;
58-
if (container is! NamedCompilationUnitMember) {
58+
if (container is! CompilationUnitMember) {
5959
return;
6060
}
6161

@@ -147,7 +147,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
147147

148148
Future<void> _forFlutterWidget({
149149
required _FixContext fixContext,
150-
required NamedCompilationUnitMember classDeclaration,
150+
required CompilationUnitMember classDeclaration,
151151
required bool requiredNamedParametersFirst,
152152
}) async {
153153
if (unit.featureSet.isEnabled(Feature.super_parameters)) {
@@ -167,7 +167,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
167167

168168
Future<void> _forFlutterWithoutSuperParameters({
169169
required _FixContext fixContext,
170-
required NamedCompilationUnitMember classDeclaration,
170+
required CompilationUnitMember classDeclaration,
171171
required bool requiredNamedParametersFirst,
172172
}) async {
173173
var keyClass = await sessionHelper.getFlutterClass('Key');
@@ -222,7 +222,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
222222

223223
Future<void> _forFlutterWithSuperParameters({
224224
required _FixContext fixContext,
225-
required NamedCompilationUnitMember classDeclaration,
225+
required CompilationUnitMember classDeclaration,
226226
required bool requiredNamedParametersFirst,
227227
}) async {
228228
await fixContext.builder.addDartFileEdit(file, (builder) {
@@ -265,7 +265,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
265265

266266
Future<void> _notFlutterNamed({
267267
required _FixContext fixContext,
268-
required NamedCompilationUnitMember containerDeclaration,
268+
required CompilationUnitMember containerDeclaration,
269269
required bool isConst,
270270
required List<_Field> fields,
271271
required bool requiredNamedParametersFirst,
@@ -346,7 +346,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
346346

347347
Future<void> _notFlutterRequiredPositional({
348348
required _FixContext fixContext,
349-
required NamedCompilationUnitMember containerDeclaration,
349+
required CompilationUnitMember containerDeclaration,
350350
required bool isConst,
351351
required List<_Field> fields,
352352
}) async {
@@ -375,7 +375,7 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
375375

376376
Future<void> _notFlutterWidget({
377377
required _FixContext fixContext,
378-
required NamedCompilationUnitMember containerDeclaration,
378+
required CompilationUnitMember containerDeclaration,
379379
required bool isConst,
380380
required bool requiredNamedParametersFirst,
381381
}) async {

‎pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {
3434
@override
3535
Future<void> compute(ChangeBuilder builder) async {
3636
var targetDeclaration = node.parent;
37-
if (targetDeclaration is! NamedCompilationUnitMember) {
37+
if (targetDeclaration is! CompilationUnitMember) {
3838
return;
3939
}
4040
if (targetDeclaration is! ClassDeclaration &&

‎pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,17 @@ abstract class RenameRefactoring implements Refactoring {
573573
nameNode = node;
574574
} else if (node is MethodDeclaration) {
575575
nameNode = node.name;
576-
} else if (node is NamedCompilationUnitMember) {
576+
} else if (node is ClassDeclaration) {
577+
nameNode = node.namePart.typeName;
578+
} else if (node is EnumDeclaration) {
579+
nameNode = node.namePart.typeName;
580+
} else if (node is ExtensionTypeDeclaration) {
581+
nameNode = node.primaryConstructor.typeName;
582+
} else if (node is FunctionDeclaration) {
583+
nameNode = node.name;
584+
} else if (node is MixinDeclaration) {
585+
nameNode = node.name;
586+
} else if (node is TypeAlias) {
577587
nameNode = node.name;
578588
} else if (node is NamedType) {
579589
nameNode = node.name;

‎pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
226226
}
227227

228228
var node = result.node;
229-
if (node is! NamedCompilationUnitMember) {
229+
if (node is! CompilationUnitMember) {
230230
return;
231231
}
232232
if (node is! ClassDeclaration && node is! EnumDeclaration) {

‎pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ class MoveTopLevelToFile extends RefactoringProducer {
311311
for (var sub in index.findSubclassesOfSealedRecursively(
312312
candidateMembers.keys.toSet(),
313313
)) {
314-
candidateMembers[sub] ??= sub is NamedCompilationUnitMember
315-
? sub.name.lexeme
314+
candidateMembers[sub] ??= sub is ClassDeclaration
315+
? sub.namePart.typeName.lexeme
316316
: null;
317317
}
318318

@@ -550,7 +550,7 @@ class _SealedSubclassIndex {
550550
) {
551551
return {
552552
...members,
553-
...members.whereType<NamedCompilationUnitMember>().expand(
553+
...members.whereType<CompilationUnitMember>().expand(
554554
(member) => findSubclassesOfSealedRecursively(
555555
sealedTypeSubclasses[member.declaredFragment?.element] ?? const {},
556556
),

‎pkg/analysis_server/lib/src/utilities/change_builder.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dar
1212
/// Builds and returns a single [SourceEdit] for a new constructor, inserted
1313
/// into [container].
1414
Future<SourceEdit?> buildEditForInsertedConstructor(
15-
NamedCompilationUnitMember container,
15+
CompilationUnitMember container,
1616
void Function(DartEditBuilder builder) buildEdit, {
1717
required ResolvedUnitResult resolvedUnit,
1818
required AnalysisSession session,

0 commit comments

Comments
 (0)