Skip to content

Commit 933f3da

Browse files
fshcheglovscheglov
fshcheglov
authored and
scheglov
committed
Deprecate appendToWithoutDelimiters, correspondingSetter2, unnamedConstructor2, getNamedConstructor2, and typeParameters2
Change-Id: I42dcff17c5bb0c9d6c3ae55dcdd4df85d83cd076 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439560 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent 5400605 commit 933f3da

File tree

81 files changed

+371
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+371
-281
lines changed

‎pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:analysis_server/src/protocol_server.dart';
1010
import 'package:analyzer/dart/element/element.dart' as engine;
1111
import 'package:analyzer/dart/element/type.dart';
1212
import 'package:analyzer/src/dart/element/element.dart';
13-
import 'package:analyzer/src/utilities/extensions/element.dart';
1413
import 'package:path/path.dart' as path;
1514

1615
Element convertElement(engine.Element element) {
@@ -205,9 +204,9 @@ String? getParametersString(engine.Element element) {
205204
String? _getTypeParametersString(engine.Element element) {
206205
List<engine.TypeParameterElement>? typeParameters;
207206
if (element is engine.InterfaceElement) {
208-
typeParameters = element.typeParameters2;
207+
typeParameters = element.typeParameters;
209208
} else if (element is engine.TypeAliasElement) {
210-
typeParameters = element.typeParameters2;
209+
typeParameters = element.typeParameters;
211210
}
212211
if (typeParameters == null || typeParameters.isEmpty) {
213212
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ class DartCallHierarchyComputer {
226226
element is InterfaceElement &&
227227
target.kind == CallHierarchyKind.constructor;
228228
if (isImplicitConstructor) {
229-
element = element.unnamedConstructor2;
229+
element = element.unnamedConstructor;
230230
}
231231

232232
// We only find incoming calls to executable elements.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class DartTypeArgumentsSignatureComputer {
4949
element = ElementLocator.locate(parent.methodName);
5050
}
5151
if (element is! TypeParameterizedElement ||
52-
element.typeParameters2.isEmpty) {
52+
element.typeParameters.isEmpty) {
5353
return null;
5454
}
5555

@@ -64,7 +64,7 @@ class DartTypeArgumentsSignatureComputer {
6464
return _toSignatureHelp(
6565
label,
6666
cleanDartdoc(documentation),
67-
element.typeParameters2,
67+
element.typeParameters,
6868
);
6969
}
7070

‎pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,28 +1391,28 @@ class DeclarationHelper {
13911391
if (!mustBeType) {
13921392
_addMembersOfEnclosingInstance(element);
13931393
}
1394-
_suggestTypeParameters(element.typeParameters2);
1394+
_suggestTypeParameters(element.typeParameters);
13951395
}
13961396
case ClassTypeAlias():
13971397
var element = declaration.declaredFragment?.element;
13981398
if (element != null) {
1399-
_suggestTypeParameters(element.typeParameters2);
1399+
_suggestTypeParameters(element.typeParameters);
14001400
}
14011401
case EnumDeclaration():
14021402
var element = declaration.declaredFragment?.element;
14031403
if (element != null) {
14041404
if (!mustBeType) {
14051405
_addMembersOfEnclosingInstance(element);
14061406
}
1407-
_suggestTypeParameters(element.typeParameters2);
1407+
_suggestTypeParameters(element.typeParameters);
14081408
}
14091409
case ExtensionDeclaration():
14101410
var element = declaration.declaredFragment?.element;
14111411
if (element != null) {
14121412
if (!mustBeType) {
14131413
_addMembersOfEnclosingInstance(element);
14141414
}
1415-
_suggestTypeParameters(element.typeParameters2);
1415+
_suggestTypeParameters(element.typeParameters);
14161416
}
14171417
case ExtensionTypeDeclaration():
14181418
var element = declaration.declaredFragment?.element;
@@ -1422,25 +1422,25 @@ class DeclarationHelper {
14221422
var fieldElement = element.representation;
14231423
_suggestField(field: fieldElement);
14241424
}
1425-
_suggestTypeParameters(element.typeParameters2);
1425+
_suggestTypeParameters(element.typeParameters);
14261426
}
14271427
case FunctionTypeAlias():
14281428
var element = declaration.declaredFragment?.element;
14291429
if (element != null) {
1430-
_suggestTypeParameters(element.typeParameters2);
1430+
_suggestTypeParameters(element.typeParameters);
14311431
}
14321432
case GenericTypeAlias():
14331433
var element = declaration.declaredFragment?.element;
14341434
if (element is TypeAliasElement) {
1435-
_suggestTypeParameters(element.typeParameters2);
1435+
_suggestTypeParameters(element.typeParameters);
14361436
}
14371437
case MixinDeclaration():
14381438
var element = declaration.declaredFragment?.element;
14391439
if (element != null) {
14401440
if (!mustBeType) {
14411441
_addMembersOfEnclosingInstance(element);
14421442
}
1443-
_suggestTypeParameters(element.typeParameters2);
1443+
_suggestTypeParameters(element.typeParameters);
14441444
}
14451445
}
14461446
}
@@ -2136,7 +2136,7 @@ class DeclarationHelper {
21362136
)) {
21372137
if ((mustBeAssignable &&
21382138
accessor is GetterElement &&
2139-
accessor.correspondingSetter2 == null) ||
2139+
accessor.correspondingSetter == null) ||
21402140
mustBeConstant ||
21412141
(mustBeNonVoid && accessor.returnType is VoidType)) {
21422142
return;
@@ -2350,7 +2350,7 @@ class DeclarationHelper {
23502350
if (visibilityTracker.isVisible(element: element, importData: importData)) {
23512351
if ((mustBeAssignable &&
23522352
element is GetterElement &&
2353-
element.correspondingSetter2 == null) ||
2353+
element.correspondingSetter == null) ||
23542354
(mustBeConstant && !element.isConst) ||
23552355
(mustBeNonVoid && element.returnType is VoidType) ||
23562356
mustBeType) {

‎pkg/analysis_server/lib/src/services/completion/dart/relevance_computer.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ class RelevanceComputer {
728728

729729
/// Return the [DartType] for an instantiated [TypeAlias].
730730
DartType _instantiateTypeAlias(TypeAliasElement element) {
731-
var typeParameters = element.typeParameters2;
731+
var typeParameters = element.typeParameters;
732732
var typeArguments = const <DartType>[];
733733
if (typeParameters.isNotEmpty) {
734734
var neverType = request.libraryElement.typeProvider.neverType;

‎pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ class SuggestionBuilder {
15241524
}
15251525

15261526
InterfaceType _instantiateInstanceElement(InterfaceElement element) {
1527-
var typeParameters = element.typeParameters2;
1527+
var typeParameters = element.typeParameters;
15281528
var typeArguments = const <DartType>[];
15291529
if (typeParameters.isNotEmpty) {
15301530
var neverType = request.libraryElement.typeProvider.neverType;
@@ -1537,7 +1537,7 @@ class SuggestionBuilder {
15371537
}
15381538

15391539
InterfaceType _instantiateInstanceElement2(InterfaceElement element) {
1540-
var typeParameters = element.typeParameters2;
1540+
var typeParameters = element.typeParameters;
15411541
var typeArguments = const <DartType>[];
15421542
if (typeParameters.isNotEmpty) {
15431543
var neverType = request.libraryElement.typeProvider.neverType;
@@ -1550,7 +1550,7 @@ class SuggestionBuilder {
15501550
}
15511551

15521552
DartType _instantiateTypeAlias(TypeAliasElement element) {
1553-
var typeParameters = element.typeParameters2;
1553+
var typeParameters = element.typeParameters;
15541554
var typeArguments = const <DartType>[];
15551555
if (typeParameters.isNotEmpty) {
15561556
var neverType = request.libraryElement.typeProvider.neverType;

‎pkg/analysis_server/lib/src/services/completion/dart/utilities.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ InterfaceType instantiateInstanceElement(
222222
InterfaceElement element,
223223
NeverType neverType,
224224
) {
225-
var typeParameters = element.typeParameters2;
225+
var typeParameters = element.typeParameters;
226226
var typeArguments = const <DartType>[];
227227
if (typeParameters.isNotEmpty) {
228228
typeArguments = List.filled(typeParameters.length, neverType);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AddSuperParameter extends ResolvedCorrectionProducer {
4545
var classElement = classDeclaration.declaredFragment!.element;
4646
var superType = classElement.supertype;
4747
var superElement = superType?.element;
48-
var superUnnamedConstructor = superElement?.unnamedConstructor2;
48+
var superUnnamedConstructor = superElement?.unnamedConstructor;
4949
if (superUnnamedConstructor == null) return;
5050

5151
var superParameters = superUnnamedConstructor.formalParameters;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ConvertClassToMixin extends ResolvedCorrectionProducer {
7878
(builder) {
7979
builder.write('mixin ');
8080
builder.write(classDeclaration.name.lexeme);
81-
builder.writeTypeParameters(classElement.typeParameters2);
81+
builder.writeTypeParameters(classElement.typeParameters);
8282
builder.writeTypes(superclassConstraints, prefix: ' on ');
8383
builder.writeTypes(interfaces, prefix: ' implements ');
8484
builder.write(' ');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class MoveTypeArgumentsToClass extends ResolvedCorrectionProducer {
4242
var type = namedType.typeOrThrow;
4343
if (type is InterfaceTypeImpl) {
4444
var element = type.element;
45-
if (element.typeParameters2.length == typeArguments.arguments.length) {
45+
if (element.typeParameters.length == typeArguments.arguments.length) {
4646
await builder.addDartFileEdit(file, (builder) {
4747
var argumentText = utils.getNodeText(typeArguments);
4848
builder.addSimpleInsertion(namedType.end, argumentText);

0 commit comments

Comments
 (0)