Skip to content

Commit b3ca203

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Start deprecating V1 elements.
This updates `analyzer_use_new_elements` lint to stop reporting inside deprecated declarations. So, we can deprecated and prepare for removal. Apply deprecation dart/analysis/results.dart Deprecate `ElementDeclarationResult`, add `FragmentDeclarationResult` instead. Change `getFragmentDeclaration` (not yet published) return type to `FragmentDeclarationResult` to better correspond to the method name. Rename `getElementDeclaration` from `AnalysisSessionHelper` to `getFragmentDeclaration`, to better reflect on what it operates. Change-Id: I2839c9a7e21ed2e5b34035fc8c3ec88fd23df1b5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412840 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 142f941 commit b3ca203

31 files changed

+291
-232
lines changed

pkg/analysis_server/lib/src/lsp/handlers/handler_definition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ class DefinitionHandler
315315
}
316316
}
317317

318-
static Future<ElementDeclarationResult?> _parsedDeclaration(
318+
static Future<FragmentDeclarationResult?> _parsedDeclaration(
319319
Fragment fragment,
320320
) async {
321321
var session = fragment.element.session;

pkg/analysis_server/lib/src/services/correction/dart/add_enum_constant.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ class AddEnumConstant extends ResolvedCorrectionProducer {
1717

1818
@override
1919
CorrectionApplicability get applicability =>
20-
// Not predictably the correct action.
21-
CorrectionApplicability
22-
.singleLocation;
20+
// Not predictably the correct action.
21+
CorrectionApplicability.singleLocation;
2322

2423
@override
2524
List<String> get fixArguments => [_constantName];
@@ -42,7 +41,7 @@ class AddEnumConstant extends ResolvedCorrectionProducer {
4241
if (targetElement.library2.isInSdk) return;
4342

4443
var targetFragment = targetElement.firstFragment;
45-
var targetDeclarationResult = await sessionHelper.getElementDeclaration(
44+
var targetDeclarationResult = await sessionHelper.getFragmentDeclaration(
4645
targetFragment,
4746
);
4847
if (targetDeclarationResult == null) return;

pkg/analysis_server/lib/src/services/correction/dart/add_late.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ class AddLate extends ResolvedCorrectionProducer {
1717

1818
@override
1919
CorrectionApplicability get applicability =>
20-
// TODO(applicability): comment on why.
21-
CorrectionApplicability
22-
.singleLocation;
20+
// TODO(applicability): comment on why.
21+
CorrectionApplicability.singleLocation;
2322

2423
@override
2524
FixKind get fixKind => DartFixKind.ADD_LATE;
@@ -69,7 +68,7 @@ class AddLate extends ResolvedCorrectionProducer {
6968
!variableElement.isLate &&
7069
variableElement.setter2 == null) {
7170
var variableFragment = variableElement.firstFragment;
72-
var declarationResult = await sessionHelper.getElementDeclaration(
71+
var declarationResult = await sessionHelper.getFragmentDeclaration(
7372
variableFragment,
7473
);
7574
if (declarationResult == null) {

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ class CreateConstructor extends ResolvedCorrectionProducer {
2222

2323
@override
2424
CorrectionApplicability get applicability =>
25-
// TODO(applicability): comment on why.
26-
CorrectionApplicability
27-
.singleLocation;
25+
// TODO(applicability): comment on why.
26+
CorrectionApplicability.singleLocation;
2827

2928
@override
3029
List<String> get fixArguments => [_constructorName];
@@ -89,7 +88,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
8988
// prepare target ClassDeclaration
9089
var targetElement = targetType.element3;
9190
var targetFragment = targetElement.firstFragment;
92-
var targetResult = await sessionHelper.getElementDeclaration(
91+
var targetResult = await sessionHelper.getFragmentDeclaration(
9392
targetFragment,
9493
);
9594
if (targetResult == null) {
@@ -130,7 +129,9 @@ class CreateConstructor extends ResolvedCorrectionProducer {
130129
}
131130

132131
// prepare target interface type
133-
var targetResult = await sessionHelper.getElementDeclaration(targetElement);
132+
var targetResult = await sessionHelper.getFragmentDeclaration(
133+
targetElement,
134+
);
134135
if (targetResult == null) {
135136
return;
136137
}
@@ -183,7 +184,7 @@ class CreateConstructor extends ResolvedCorrectionProducer {
183184
}
184185

185186
// prepare target ClassDeclaration
186-
var targetResult = await sessionHelper.getElementDeclaration(
187+
var targetResult = await sessionHelper.getFragmentDeclaration(
187188
targetFragment,
188189
);
189190
if (targetResult == null) {

pkg/analysis_server/lib/src/services/correction/dart/create_field.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CreateField extends CreateFieldOrGetter {
7575
}
7676
// Prepare target `ClassDeclaration`.
7777
var targetFragment = targetElement.firstFragment;
78-
var targetDeclarationResult = await sessionHelper.getElementDeclaration(
78+
var targetDeclarationResult = await sessionHelper.getFragmentDeclaration(
7979
targetFragment,
8080
);
8181
if (targetDeclarationResult == null) {

pkg/analysis_server/lib/src/services/correction/dart/create_getter.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ class CreateGetter extends CreateFieldOrGetter {
9191

9292
@override
9393
CorrectionApplicability get applicability =>
94-
// TODO(applicability): comment on why.
95-
CorrectionApplicability
96-
.singleLocation;
94+
// TODO(applicability): comment on why.
95+
CorrectionApplicability.singleLocation;
9796

9897
@override
9998
List<String> get fixArguments => [_getterName];
@@ -199,7 +198,7 @@ class CreateGetter extends CreateFieldOrGetter {
199198
return;
200199
}
201200
// prepare target declaration
202-
var targetDeclarationResult = await sessionHelper.getElementDeclaration(
201+
var targetDeclarationResult = await sessionHelper.getFragmentDeclaration(
203202
targetFragment,
204203
);
205204
if (targetDeclarationResult == null) {

pkg/analysis_server/lib/src/services/correction/dart/create_setter.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ class CreateSetter extends ResolvedCorrectionProducer {
1919

2020
@override
2121
CorrectionApplicability get applicability =>
22-
// TODO(applicability): comment on why.
23-
CorrectionApplicability
24-
.singleLocation;
22+
// TODO(applicability): comment on why.
23+
CorrectionApplicability.singleLocation;
2524

2625
@override
2726
List<String> get fixArguments => [_setterName];
@@ -83,7 +82,7 @@ class CreateSetter extends ResolvedCorrectionProducer {
8382
return;
8483
}
8584
// prepare target declaration
86-
var targetDeclarationResult = await sessionHelper.getElementDeclaration(
85+
var targetDeclarationResult = await sessionHelper.getFragmentDeclaration(
8786
targetFragment,
8887
);
8988
if (targetDeclarationResult == null) {

pkg/analysis_server/lib/src/services/correction/dart/make_field_not_final.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ class MakeFieldNotFinal extends ResolvedCorrectionProducer {
1919

2020
@override
2121
CorrectionApplicability get applicability =>
22-
// TODO(applicability): comment on why.
23-
CorrectionApplicability
24-
.singleLocation;
22+
// TODO(applicability): comment on why.
23+
CorrectionApplicability.singleLocation;
2524

2625
@override
2726
List<String> get fixArguments => [_fieldName];
@@ -57,7 +56,7 @@ class MakeFieldNotFinal extends ResolvedCorrectionProducer {
5756
return;
5857
}
5958

60-
var declaration = await sessionHelper.getElementDeclaration(
59+
var declaration = await sessionHelper.getFragmentDeclaration(
6160
variable.firstFragment,
6261
);
6362
var variableNode = declaration?.node;

pkg/analysis_server/lib/src/services/correction/executable_parameters.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class ExecutableParameters {
4343
/// Return the [FormalParameterList] of the [executable], or `null` if it
4444
/// can't be found.
4545
Future<FormalParameterList?> getParameterList() async {
46-
var result = await sessionHelper.getElementDeclaration(firstFragment);
46+
var result = await sessionHelper.getFragmentDeclaration(firstFragment);
4747
var targetDeclaration = result?.node;
4848
if (targetDeclaration is ConstructorDeclaration) {
4949
return targetDeclaration.parameters;
@@ -61,7 +61,7 @@ class ExecutableParameters {
6161
Future<FormalParameter?> getParameterNode(
6262
FormalParameterFragment fragment,
6363
) async {
64-
var result = await sessionHelper.getElementDeclaration(fragment);
64+
var result = await sessionHelper.getFragmentDeclaration(fragment);
6565
var declaration = result?.node;
6666
for (var node = declaration; node != null; node = node.parent) {
6767
if (node is FormalParameter && node.parent is FormalParameterList) {

pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ class _SelectionAnalyzer {
595595

596596
Future<AstNode?> _elementDeclaration(ExecutableElement2 element) async {
597597
var helper = refactoringContext.sessionHelper;
598-
var nodeResult = await helper.getElementDeclaration(element.firstFragment);
598+
var nodeResult = await helper.getFragmentDeclaration(element.firstFragment);
599599
return nodeResult?.node;
600600
}
601601
}
@@ -668,7 +668,7 @@ class _SignatureUpdater {
668668
/// Returns the [MethodDeclaration] for a [MethodElement2].
669669
Future<AstNode?> elementDeclaration(ExecutableElement2 element) async {
670670
var helper = sessionHelper;
671-
var result = await helper.getElementDeclaration(element.firstFragment);
671+
var result = await helper.getFragmentDeclaration(element.firstFragment);
672672
return result?.node;
673673
}
674674

0 commit comments

Comments
 (0)