Skip to content

Commit 7630c24

Browse files
scheglovCommit Queue
authored and
Commit Queue
committed
Elements. Migrate lib/src/utilities/extensions/element.dart
Change-Id: I503dd24aa3911e59a69646eda23320c3d175c6b5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/418928 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 0691b01 commit 7630c24

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3268,7 +3268,7 @@ abstract class ElementImpl2 implements Element2 {
32683268
/// Return an identifier that uniquely identifies this element among the
32693269
/// children of this element's parent.
32703270
String get identifier {
3271-
var identifier = name3 ?? (asElement as ElementImpl).codeOffset.toString();
3271+
var identifier = name3!;
32723272
// TODO(augmentations): Figure out how to get a unique identifier. In the
32733273
// old model we sometimes used the offset of the name to disambiguate
32743274
// between elements, but we can't do that anymore because the name can

pkg/analyzer/lib/src/utilities/extensions/element.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: analyzer_use_new_elements
6-
75
import 'package:analyzer/dart/element/element.dart';
86
import 'package:analyzer/dart/element/element2.dart';
97
import 'package:analyzer/dart/element/nullability_suffix.dart';
@@ -188,6 +186,7 @@ extension Element2Extension on Element2 {
188186
}
189187

190188
extension Element2OrNullExtension on Element2? {
189+
@Deprecated('Use Element2 instead')
191190
Element? get asElement {
192191
var self = this;
193192
switch (self) {
@@ -243,8 +242,6 @@ extension Element2OrNullExtension on Element2? {
243242
throw UnsupportedError('Unsupported type: $runtimeType');
244243
}
245244
}
246-
247-
ElementImpl? get asElementImpl => asElement as ElementImpl;
248245
}
249246

250247
extension ElementImplExtension on ElementImpl {
@@ -255,6 +252,7 @@ extension ElementImplExtension on ElementImpl {
255252
}
256253
}
257254

255+
@Deprecated('Use Element2 instead')
258256
extension ElementOrNullExtension on Element? {
259257
Element2? get asElement2 {
260258
var self = this;
@@ -339,9 +337,10 @@ extension ExecutableElementOrMemberExtension on ExecutableElementOrMember {
339337
}
340338

341339
ExecutableElementImpl get declarationImpl =>
342-
declaration as ExecutableElementImpl;
340+
asElement2.baseElement.firstFragment as ExecutableElementImpl;
343341

344-
ElementImpl get enclosingElementImpl => enclosingElement3 as ElementImpl;
342+
ElementImpl get enclosingElementImpl =>
343+
asElement2.enclosingElement2!.firstFragment as ElementImpl;
345344
}
346345

347346
extension ExtensionElementImpl2Extension on ExtensionElementImpl2 {

0 commit comments

Comments
 (0)