[migration] Rename utilities in protocol_dart.dart
Change-Id: I90c06dffcac98bc8ec6bb2a982a6825157eda56d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407620
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
index fc6f026..fed9909 100644
--- a/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
+++ b/pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart
@@ -13,12 +13,12 @@
import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:path/path.dart' as path;
-Element convertElement2(engine.Element2 element) {
- var kind = convertElementToElementKind2(element);
- var name = getElementDisplayName2(element);
- var elementTypeParameters = _getTypeParametersString2(element);
+Element convertElement(engine.Element2 element) {
+ var kind = convertElementToElementKind(element);
+ var name = getElementDisplayName(element);
+ var elementTypeParameters = _getTypeParametersString(element);
var aliasedType = getAliasedTypeString2(element);
- var elementParameters = getParametersString2(element);
+ var elementParameters = getParametersString(element);
var elementReturnType = getReturnTypeString2(element);
return Element(
kind,
@@ -28,10 +28,10 @@
isDeprecated:
(element is engine.Annotatable) &&
(element as engine.Annotatable).metadata2.hasDeprecated,
- isAbstract: _isAbstract2(element),
- isConst: _isConst2(element),
- isFinal: _isFinal2(element),
- isStatic: _isStatic2(element),
+ isAbstract: _isAbstract(element),
+ isConst: _isConst(element),
+ isFinal: _isFinal(element),
+ isStatic: _isStatic(element),
),
location: newLocation_fromElement2(element),
typeParameters: elementTypeParameters,
@@ -46,7 +46,7 @@
///
/// This does not take into account that an instance of [engine.ClassElement]
/// can be an enum and an instance of [engine.FieldElement] can be an enum
-/// constant. Use [convertElementToElementKind2] where possible.
+/// constant. Use [convertElementToElementKind] where possible.
ElementKind convertElementKind(engine.ElementKind kind) {
if (kind == engine.ElementKind.CLASS) {
return ElementKind.CLASS;
@@ -121,7 +121,7 @@
}
/// Return an [ElementKind] corresponding to the given [engine.Element2].
-ElementKind convertElementToElementKind2(engine.Element2 element) {
+ElementKind convertElementToElementKind(engine.Element2 element) {
if (element is engine.EnumElement2) {
return ElementKind.ENUM;
} else if (element is engine.MixinElement2) {
@@ -134,11 +134,11 @@
}
Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
- var kind = convertElementToElementKind2(fragment);
- var name = getElementDisplayName2(fragment);
- var elementTypeParameters = _getTypeParametersString2(fragment);
+ var kind = convertElementToElementKind(fragment);
+ var name = getElementDisplayName(fragment);
+ var elementTypeParameters = _getTypeParametersString(fragment);
var aliasedType = getAliasedTypeString2(fragment);
- var elementParameters = getParametersString2(fragment);
+ var elementParameters = getParametersString(fragment);
var elementReturnType = getReturnTypeString2(fragment);
return Element(
kind,
@@ -146,10 +146,10 @@
Element.makeFlags(
isPrivate: fragment.isPrivate,
isDeprecated: fragment.hasDeprecated,
- isAbstract: _isAbstract2(fragment),
- isConst: _isConst2(fragment),
- isFinal: _isFinal2(fragment),
- isStatic: _isStatic2(fragment),
+ isAbstract: _isAbstract(fragment),
+ isConst: _isConst(fragment),
+ isFinal: _isFinal(fragment),
+ isStatic: _isStatic(fragment),
),
location: newLocation_fromFragment(fragment),
typeParameters: elementTypeParameters,
@@ -159,7 +159,7 @@
);
}
-String getElementDisplayName2(engine.Element2 element) {
+String getElementDisplayName(engine.Element2 element) {
if (element is engine.LibraryFragment) {
return path.basename((element as engine.LibraryFragment).source.fullName);
} else {
@@ -167,7 +167,7 @@
}
}
-String? getParametersString2(engine.Element2 element) {
+String? getParametersString(engine.Element2 element) {
// TODO(scheglov): expose the corresponding feature from ExecutableElement
List<engine.FormalParameterElement> parameters;
if (element is engine.ExecutableElement2) {
@@ -188,7 +188,7 @@
return null;
}
- parameters.sort(_preferRequiredParams2);
+ parameters.sort(_preferRequiredParams);
var sb = StringBuffer();
var closeOptionalString = '';
@@ -216,7 +216,7 @@
return '($sb)';
}
-String? _getTypeParametersString2(engine.Element2 element) {
+String? _getTypeParametersString(engine.Element2 element) {
List<engine.TypeParameterElement2>? typeParameters;
if (element is engine.InterfaceElement2) {
typeParameters = element.typeParameters2;
@@ -229,7 +229,7 @@
return '<${typeParameters.join(', ')}>';
}
-bool _isAbstract2(engine.Element2 element) {
+bool _isAbstract(engine.Element2 element) {
if (element is engine.ClassElement2) {
return element.isAbstract;
}
@@ -242,7 +242,7 @@
return false;
}
-bool _isConst2(engine.Element2 element) {
+bool _isConst(engine.Element2 element) {
if (element is engine.ConstructorElement2) {
return element.isConst;
}
@@ -252,14 +252,14 @@
return false;
}
-bool _isFinal2(engine.Element2 element) {
+bool _isFinal(engine.Element2 element) {
if (element is engine.VariableElement2) {
return element.isFinal;
}
return false;
}
-bool _isStatic2(engine.Element2 element) {
+bool _isStatic(engine.Element2 element) {
if (element is engine.ExecutableElement2) {
return element.isStatic;
}
@@ -270,7 +270,7 @@
}
/// Sort required named parameters before optional ones.
-int _preferRequiredParams2(
+int _preferRequiredParams(
engine.FormalParameterElement e1,
engine.FormalParameterElement e2,
) {
diff --git a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
index 1c269e0..610fcc7 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
@@ -18,7 +18,7 @@
// For legacy protocol, we only support occurrences with the same
// length, so we must filter the offset to only those that match the length
// from the element.
- var serverElement = protocol.convertElement2(engineElement);
+ var serverElement = protocol.convertElement(engineElement);
// Prefer the length from the mapped element over the element directly,
// because 'name3' may contain 'new' for constructors which doesn't match
// what is in the source.
diff --git a/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart b/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
index d085909..93d200e 100644
--- a/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
+++ b/pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart
@@ -49,7 +49,7 @@
var result = protocol.SearchFindElementReferencesResult();
if (element != null) {
result.id = searchId;
- result.element = protocol.convertElement2(element.asElement2!);
+ result.element = protocol.convertElement(element.asElement2!);
}
sendResult(result);
// search elements
diff --git a/pkg/analysis_server/lib/src/lsp/completion_utils.dart b/pkg/analysis_server/lib/src/lsp/completion_utils.dart
index a63baa5..0f1c73c 100644
--- a/pkg/analysis_server/lib/src/lsp/completion_utils.dart
+++ b/pkg/analysis_server/lib/src/lsp/completion_utils.dart
@@ -552,7 +552,7 @@
}
String? parameters;
if (element != null) {
- parameters = getParametersString2(element);
+ parameters = getParametersString(element);
// Prefer the element return type (because it may be more specific
// for overrides) and fall back to the parameter type or return type from
// the suggestion (handles records).
diff --git a/pkg/analysis_server/lib/src/protocol_server.dart b/pkg/analysis_server/lib/src/protocol_server.dart
index 0209532..ec8e6b2 100644
--- a/pkg/analysis_server/lib/src/protocol_server.dart
+++ b/pkg/analysis_server/lib/src/protocol_server.dart
@@ -382,7 +382,7 @@
/// Construct based on an element from the analyzer engine.
OverriddenMember newOverriddenMember_fromEngine(engine.Element2 member) {
- var element = convertElement2(member);
+ var element = convertElement(member);
var className = member.enclosingElement2!.displayName;
return OverriddenMember(element, className);
}
@@ -444,7 +444,7 @@
convertLibraryFragment(fragment as CompilationUnitElementImpl),
);
}
- path.add(convertElement2(e.asElement2!));
+ path.add(convertElement(e.asElement2!));
}
}
}
diff --git a/pkg/analysis_server/lib/src/search/type_hierarchy.dart b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
index c1f3eeb..a531194 100644
--- a/pkg/analysis_server/lib/src/search/type_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
@@ -5,7 +5,7 @@
import 'dart:collection';
import 'package:analysis_server/src/protocol_server.dart'
- show TypeHierarchyItem, convertElement2;
+ show TypeHierarchyItem, convertElement;
import 'package:analysis_server/src/services/search/hierarchy.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/dart/element/element2.dart';
@@ -70,10 +70,10 @@
var subMemberElement = helper.findMemberElement(subElement);
var subMemberElementDeclared = subMemberElement?.nonSynthetic2;
subItem = TypeHierarchyItem(
- convertElement2(subElement),
+ convertElement(subElement),
memberElement:
subMemberElementDeclared != null
- ? convertElement2(subMemberElementDeclared)
+ ? convertElement(subMemberElementDeclared)
: null,
superclass: itemId,
);
@@ -122,11 +122,11 @@
var memberElement = helper.findMemberElement(classElement);
var memberElementDeclared = memberElement?.nonSynthetic2;
item = TypeHierarchyItem(
- convertElement2(classElement),
+ convertElement(classElement),
displayName: displayName,
memberElement:
memberElementDeclared != null
- ? convertElement2(memberElementDeclared)
+ ? convertElement(memberElementDeclared)
: null,
);
_elementItemMap[classElement] = item;
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
index c93c7cd..ccb7e27 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -723,7 +723,7 @@
parameterName: name,
parameterType: type,
replacementLength: replacementLength,
- element: convertElement2(parameter),
+ element: convertElement(parameter),
);
if (parameter is FieldFormalParameterElement2) {
@@ -847,7 +847,7 @@
displayText: displayText,
requiredImports: overrideImports.toList(),
);
- suggestion.element = protocol.convertElement2(element);
+ suggestion.element = protocol.convertElement(element);
_addSuggestion(
suggestion,
textToMatchOverride: _textToMatchOverride(element),
@@ -1464,7 +1464,7 @@
_ElementCompletionData _createElementCompletionData(Element2 element) {
var documentation = _getDocumentation(element);
- var suggestedElement = protocol.convertElement2(element);
+ var suggestedElement = protocol.convertElement(element);
String? declaringType;
if (element is! FormalParameterElement) {
diff --git a/pkg/analysis_server/test/plugin/protocol_dart_test.dart b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
index 6638ce6..b9063a3 100644
--- a/pkg/analysis_server/test/plugin/protocol_dart_test.dart
+++ b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
@@ -28,7 +28,7 @@
{
var engineElement = findElement2.class_('_A');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CLASS);
expect(element.name, '_A');
expect(element.typeParameters, isNull);
@@ -49,7 +49,7 @@
{
var engineElement = findElement2.class_('B');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CLASS);
expect(element.name, 'B');
expect(element.typeParameters, '<K, V>');
@@ -64,7 +64,7 @@
}''');
var engineElement = findElement2.constructor('myConstructor');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.CONSTRUCTOR);
expect(element.name, 'A.myConstructor');
expect(element.typeParameters, isNull);
@@ -91,7 +91,7 @@
var engineElement = findElement2.constructor('myConstructor');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.parameters, '(int a, {required int c, int? b})');
}
@@ -106,7 +106,7 @@
var engineElement = findElement2.constructor('myConstructor');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(
element.parameters,
'(int a, {required int d, required int c, int? b})',
@@ -125,7 +125,7 @@
var engineElement = findElement2.constructor('myConstructor');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(
element.parameters,
'(int a, {required int d, required int c, int b, int a})',
@@ -135,7 +135,7 @@
void test_dynamic() {
var engineElement = engine.DynamicElementImpl2.instance;
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.UNKNOWN);
expect(element.name, 'dynamic');
expect(element.location, isNull);
@@ -153,7 +153,7 @@
var engineElement = findElement2.enum_('_E1');
expect(engineElement.metadata2.hasDeprecated, isTrue);
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM);
expect(element.name, '_E1');
expect(element.typeParameters, isNull);
@@ -175,7 +175,7 @@
{
var engineElement = findElement2.enum_('E2');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM);
expect(element.name, 'E2');
expect(element.typeParameters, isNull);
@@ -191,7 +191,7 @@
{
var engineElement = findElement2.field('one');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM_CONSTANT);
expect(element.name, 'one');
{
@@ -215,7 +215,7 @@
{
var engineElement = findElement2.field('three');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.ENUM_CONSTANT);
expect(element.name, 'three');
{
@@ -233,7 +233,7 @@
{
var engineElement = findElement2.field('values', of: 'E2');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'values');
{
@@ -257,7 +257,7 @@
}''');
var engineElement = findElement2.field('myField');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.FIELD);
expect(element.name, 'myField');
{
@@ -279,7 +279,7 @@
''');
var engineElement = findElement2.typeAlias('F');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
@@ -302,7 +302,7 @@
''');
var engineElement = findElement2.typeAlias('F');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<out T>');
@@ -326,7 +326,7 @@
''');
var engineElement = findElement2.typeAlias('F');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.TYPE_ALIAS);
expect(element.name, 'F');
expect(element.typeParameters, '<T>');
@@ -351,7 +351,7 @@
}''');
var engineElement = findElement2.getter('myGetter');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.GETTER);
expect(element.name, 'myGetter');
{
@@ -377,7 +377,7 @@
}''');
var engineElement = findElement2.label('myLabel');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.LABEL);
expect(element.name, 'myLabel');
{
@@ -402,7 +402,7 @@
}''');
var engineElement = findElement2.method('myMethod');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.METHOD);
expect(element.name, 'myMethod');
{
@@ -425,7 +425,7 @@
{
var engineElement = findElement2.mixin('A');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.MIXIN);
expect(element.name, 'A');
expect(element.typeParameters, isNull);
@@ -449,7 +449,7 @@
}''');
var engineElement = findElement2.setter('mySetter');
// create notification Element
- var element = convertElement2(engineElement);
+ var element = convertElement(engineElement);
expect(element.kind, ElementKind.SETTER);
expect(element.name, 'mySetter');
{
diff --git a/pkg/analysis_server/tool/code_completion/relevance_metrics.dart b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
index 331ce25..71e6deb 100644
--- a/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
+++ b/pkg/analysis_server/tool/code_completion/relevance_metrics.dart
@@ -7,7 +7,7 @@
import 'package:_fe_analyzer_shared/src/base/syntactic_entity.dart';
import 'package:analysis_server/src/protocol_server.dart'
- show convertElementToElementKind2, ElementKind;
+ show convertElementToElementKind, ElementKind;
import 'package:analysis_server/src/services/completion/dart/feature_computer.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/dart/analysis/context_root.dart';
@@ -1683,7 +1683,7 @@
/// identifier that is a child of the [node].
ElementKind? _leftMostKind(AstNode node) {
if (node is InstanceCreationExpression) {
- return convertElementToElementKind2(node.constructorName.element!);
+ return convertElementToElementKind(node.constructorName.element!);
}
var element = _leftMostElement(node);
if (element == null) {
@@ -1695,7 +1695,7 @@
element = parent.element2!;
}
}
- return convertElementToElementKind2(element);
+ return convertElementToElementKind(element);
}
/// Return the left-most token that is a child of the [node].
