Skip to content

Commit b2fdd8a

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Rename XyzElement2 into XyzElement.
The CL was done with rename + adding typedef for each class. Change-Id: Ia25cc581d2e42cf7d12a85a3579af952d5c232ee Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424687 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 1bc77c8 commit b2fdd8a

File tree

458 files changed

+5000
-4907
lines changed

Some content is hidden

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

458 files changed

+5000
-4907
lines changed

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

+26-26
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:analyzer/src/dart/element/element.dart';
1313
import 'package:analyzer/src/utilities/extensions/element.dart';
1414
import 'package:path/path.dart' as path;
1515

16-
Element convertElement(engine.Element2 element) {
16+
Element convertElement(engine.Element element) {
1717
var kind = convertElementToElementKind(element);
1818
var name = getElementDisplayName(element);
1919
var elementTypeParameters = _getTypeParametersString(element);
@@ -120,14 +120,14 @@ ElementKind convertElementKind(engine.ElementKind kind) {
120120
return ElementKind.UNKNOWN;
121121
}
122122

123-
/// Return an [ElementKind] corresponding to the given [engine.Element2].
124-
ElementKind convertElementToElementKind(engine.Element2 element) {
125-
if (element is engine.EnumElement2) {
123+
/// Return an [ElementKind] corresponding to the given [engine.Element].
124+
ElementKind convertElementToElementKind(engine.Element element) {
125+
if (element is engine.EnumElement) {
126126
return ElementKind.ENUM;
127-
} else if (element is engine.MixinElement2) {
127+
} else if (element is engine.MixinElement) {
128128
return ElementKind.MIXIN;
129129
}
130-
if (element is engine.FieldElement2 && element.isEnumConstant) {
130+
if (element is engine.FieldElement && element.isEnumConstant) {
131131
return ElementKind.ENUM_CONSTANT;
132132
}
133133
return convertElementKind(element.kind);
@@ -145,25 +145,25 @@ Element convertLibraryFragment(CompilationUnitElementImpl fragment) {
145145
);
146146
}
147147

148-
String getElementDisplayName(engine.Element2 element) {
148+
String getElementDisplayName(engine.Element element) {
149149
if (element is engine.LibraryFragment) {
150150
return path.basename((element as engine.LibraryFragment).source.fullName);
151151
} else {
152152
return element.displayName;
153153
}
154154
}
155155

156-
String? getParametersString(engine.Element2 element) {
156+
String? getParametersString(engine.Element element) {
157157
// TODO(scheglov): expose the corresponding feature from ExecutableElement
158158
List<engine.FormalParameterElement> parameters;
159-
if (element is engine.ExecutableElement2) {
159+
if (element is engine.ExecutableElement) {
160160
// valid getters don't have parameters
161161
if (element.kind == engine.ElementKind.GETTER &&
162162
element.formalParameters.isEmpty) {
163163
return null;
164164
}
165165
parameters = element.formalParameters.toList();
166-
} else if (element is engine.TypeAliasElement2) {
166+
} else if (element is engine.TypeAliasElement) {
167167
var aliasedType = element.aliasedType;
168168
if (aliasedType is FunctionType) {
169169
parameters = aliasedType.formalParameters.toList();
@@ -202,11 +202,11 @@ String? getParametersString(engine.Element2 element) {
202202
return '($sb)';
203203
}
204204

205-
String? _getTypeParametersString(engine.Element2 element) {
206-
List<engine.TypeParameterElement2>? typeParameters;
207-
if (element is engine.InterfaceElement2) {
205+
String? _getTypeParametersString(engine.Element element) {
206+
List<engine.TypeParameterElement>? typeParameters;
207+
if (element is engine.InterfaceElement) {
208208
typeParameters = element.typeParameters2;
209-
} else if (element is engine.TypeAliasElement2) {
209+
} else if (element is engine.TypeAliasElement) {
210210
typeParameters = element.typeParameters2;
211211
}
212212
if (typeParameters == null || typeParameters.isEmpty) {
@@ -215,41 +215,41 @@ String? _getTypeParametersString(engine.Element2 element) {
215215
return '<${typeParameters.join(', ')}>';
216216
}
217217

218-
bool _isAbstract(engine.Element2 element) {
219-
if (element is engine.ClassElement2) {
218+
bool _isAbstract(engine.Element element) {
219+
if (element is engine.ClassElement) {
220220
return element.isAbstract;
221221
}
222-
if (element is engine.MethodElement2) {
222+
if (element is engine.MethodElement) {
223223
return element.isAbstract;
224224
}
225-
if (element is engine.MixinElement2) {
225+
if (element is engine.MixinElement) {
226226
return true;
227227
}
228228
return false;
229229
}
230230

231-
bool _isConst(engine.Element2 element) {
232-
if (element is engine.ConstructorElement2) {
231+
bool _isConst(engine.Element element) {
232+
if (element is engine.ConstructorElement) {
233233
return element.isConst;
234234
}
235-
if (element is engine.VariableElement2) {
235+
if (element is engine.VariableElement) {
236236
return element.isConst;
237237
}
238238
return false;
239239
}
240240

241-
bool _isFinal(engine.Element2 element) {
242-
if (element is engine.VariableElement2) {
241+
bool _isFinal(engine.Element element) {
242+
if (element is engine.VariableElement) {
243243
return element.isFinal;
244244
}
245245
return false;
246246
}
247247

248-
bool _isStatic(engine.Element2 element) {
249-
if (element is engine.ExecutableElement2) {
248+
bool _isStatic(engine.Element element) {
249+
if (element is engine.ExecutableElement) {
250250
return element.isStatic;
251251
}
252-
if (element is engine.PropertyInducingElement2) {
252+
if (element is engine.PropertyInducingElement) {
253253
return element.isStatic;
254254
}
255255
return false;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,10 @@ abstract class AnalysisServer {
639639
/// Gets the current version number of a document (if known).
640640
int? getDocumentVersion(String path);
641641

642-
/// Return a [Future] that completes with the [Element2] at the given
642+
/// Return a [Future] that completes with the [Element] at the given
643643
/// [offset] of the given [file], or with `null` if there is no node at the
644644
/// [offset] or the node does not have an element.
645-
Future<Element2?> getElementAtOffset(String file, int offset) async {
645+
Future<Element?> getElementAtOffset(String file, int offset) async {
646646
var unitResult = await getResolvedUnit(file);
647647
if (unitResult == null) {
648648
return null;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class CiderCompletionComputer {
190190
/// Return cached, or compute unprefixed suggestions for all elements
191191
/// exported from the library.
192192
List<CompletionSuggestionBuilder> _importedLibrarySuggestions({
193-
required LibraryElement2 element,
193+
required LibraryElement element,
194194
required OperationPerformanceImpl performance,
195195
}) {
196196
performance.getDataInt('libraryCount').increment();
@@ -212,7 +212,7 @@ class CiderCompletionComputer {
212212
/// Compute all unprefixed suggestions for all elements exported from
213213
/// the library.
214214
List<CompletionSuggestionBuilder> _librarySuggestions(
215-
LibraryElement2 element,
215+
LibraryElement element,
216216
) {
217217
var suggestionBuilder = SuggestionBuilder(
218218
_dartCompletionRequest,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ class _CiderDartFixContextImpl extends DartFixContext {
8383
}) : super(instrumentationService: InstrumentationService.NULL_SERVICE);
8484

8585
@override
86-
Future<Map<LibraryElement2, Element2>> getTopLevelDeclarations(
86+
Future<Map<LibraryElement, Element>> getTopLevelDeclarations(
8787
String name,
8888
) async {
89-
var result = <LibraryElement2, Element2>{};
89+
var result = <LibraryElement, Element>{};
9090
var files = _fileResolver.getFilesWithTopLevelDeclarations(name);
9191
for (var file in files) {
9292
var kind = file.kind;
@@ -101,5 +101,5 @@ class _CiderDartFixContextImpl extends DartFixContext {
101101
}
102102

103103
@override
104-
Stream<LibraryElement2> librariesWithExtensions(Name memberName) async* {}
104+
Stream<LibraryElement> librariesWithExtensions(Name memberName) async* {}
105105
}

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class LibraryElementSuggestionBuilder
2929
final String? prefix;
3030

3131
/// The set of libraries that have been, or are currently being, visited.
32-
final Set<LibraryElement2> visitedLibraries = <LibraryElement2>{};
32+
final Set<LibraryElement> visitedLibraries = <LibraryElement>{};
3333

3434
factory LibraryElementSuggestionBuilder(
3535
DartCompletionRequest request,
@@ -59,7 +59,7 @@ class LibraryElementSuggestionBuilder
5959
);
6060

6161
@override
62-
void visitClassElement(ClassElement2 element) {
62+
void visitClassElement(ClassElement element) {
6363
AstNode node = request.target.containingNode;
6464
var libraryElement = request.libraryElement;
6565
if (node is ExtendsClause && !element.isExtendableIn2(libraryElement)) {
@@ -74,17 +74,17 @@ class LibraryElementSuggestionBuilder
7474
}
7575

7676
@override
77-
void visitElement(Element2 element) {
77+
void visitElement(Element element) {
7878
// ignored
7979
}
8080

8181
@override
82-
visitEnumElement(EnumElement2 element) {
82+
visitEnumElement(EnumElement element) {
8383
_visitInterfaceElement(element);
8484
}
8585

8686
@override
87-
void visitExtensionElement(ExtensionElement2 element) {
87+
void visitExtensionElement(ExtensionElement element) {
8888
if (opType.includeReturnValueSuggestions) {
8989
if (element.name3 != null) {
9090
builder.suggestExtension(element, kind: kind, prefix: prefix);
@@ -93,7 +93,7 @@ class LibraryElementSuggestionBuilder
9393
}
9494

9595
@override
96-
void visitExtensionTypeElement(ExtensionTypeElement2 element) {
96+
void visitExtensionTypeElement(ExtensionTypeElement element) {
9797
_visitInterfaceElement(element);
9898
}
9999

@@ -105,9 +105,9 @@ class LibraryElementSuggestionBuilder
105105
variable != null &&
106106
variable.isConst)) {
107107
var parent = element.enclosingElement2;
108-
if (parent is InterfaceElement2 || parent is ExtensionElement2) {
108+
if (parent is InterfaceElement || parent is ExtensionElement) {
109109
if (element.isSynthetic) {
110-
if (variable is FieldElement2) {
110+
if (variable is FieldElement) {
111111
builder.suggestField(variable, inheritanceDistance: 0.0);
112112
}
113113
} else {
@@ -120,14 +120,14 @@ class LibraryElementSuggestionBuilder
120120
}
121121

122122
@override
123-
void visitLibraryElement(LibraryElement2 element) {
123+
void visitLibraryElement(LibraryElement element) {
124124
if (visitedLibraries.add(element)) {
125125
element.visitChildren2(this);
126126
}
127127
}
128128

129129
@override
130-
visitMixinElement(MixinElement2 element) {
130+
visitMixinElement(MixinElement element) {
131131
AstNode node = request.target.containingNode;
132132
if (node is ImplementsClause &&
133133
!element.isImplementableIn2(request.libraryElement)) {
@@ -144,7 +144,7 @@ class LibraryElementSuggestionBuilder
144144
variable != null &&
145145
variable.isConst)) {
146146
var parent = element.enclosingElement2;
147-
if (parent is InterfaceElement2 || parent is ExtensionElement2) {
147+
if (parent is InterfaceElement || parent is ExtensionElement) {
148148
if (!element.isSynthetic) {
149149
builder.suggestSetter(element, inheritanceDistance: 0.0);
150150
}
@@ -169,14 +169,14 @@ class LibraryElementSuggestionBuilder
169169
}
170170

171171
@override
172-
void visitTopLevelVariableElement(TopLevelVariableElement2 element) {
172+
void visitTopLevelVariableElement(TopLevelVariableElement element) {
173173
if (opType.includeReturnValueSuggestions && !element.isSynthetic) {
174174
builder.suggestTopLevelVariable(element, prefix: prefix);
175175
}
176176
}
177177

178178
@override
179-
void visitTypeAliasElement(TypeAliasElement2 element) {
179+
void visitTypeAliasElement(TypeAliasElement element) {
180180
if (opType.includeTypeNameSuggestions) {
181181
builder.suggestTypeAlias(element, prefix: prefix);
182182
}
@@ -186,10 +186,10 @@ class LibraryElementSuggestionBuilder
186186
///
187187
/// If [onlyConst] is `true`, only `const` constructors will be suggested.
188188
void _addConstructorSuggestions(
189-
ClassElement2 element, {
189+
ClassElement element, {
190190
bool onlyConst = false,
191191
}) {
192-
if (element is EnumElement2) {
192+
if (element is EnumElement) {
193193
return;
194194
}
195195

@@ -207,11 +207,11 @@ class LibraryElementSuggestionBuilder
207207
}
208208
}
209209

210-
void _visitInterfaceElement(InterfaceElement2 element) {
210+
void _visitInterfaceElement(InterfaceElement element) {
211211
if (opType.includeTypeNameSuggestions) {
212212
builder.suggestInterface(element, prefix: prefix);
213213
}
214-
if (element is ClassElement2) {
214+
if (element is ClassElement) {
215215
if (opType.includeConstructorSuggestions) {
216216
_addConstructorSuggestions(element);
217217
} else if (opType.includeAnnotationSuggestions) {

0 commit comments

Comments
 (0)