Skip to content

Commit 2ad4452

Browse files
bwilkersonCommit Queue
authored andcommitted
[Migrate] ast.dart (extentions)
Change-Id: Ia824f614e450c56b98fd5f38f1dec17cb421a3f3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402905 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 076b05f commit 2ad4452

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ lib/src/summary2/variance_builder.dart
143143
lib/src/test_utilities/find_element.dart
144144
lib/src/test_utilities/find_node.dart
145145
lib/src/test_utilities/mock_sdk_elements.dart
146-
lib/src/utilities/extensions/ast.dart
147146
lib/src/utilities/extensions/element.dart
148147
lib/src/utilities/extensions/flutter.dart
149148
lib/src/utilities/extensions/library_element.dart

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

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/token.dart';
7-
import 'package:analyzer/dart/element/element.dart';
87
import 'package:analyzer/dart/element/element2.dart';
98
import 'package:analyzer/src/dart/element/element.dart';
109

@@ -27,22 +26,6 @@ extension AstNodeExtension on AstNode {
2726
return result;
2827
}
2928

30-
/// The [ExecutableElement] of the enclosing executable [AstNode].
31-
ExecutableElement? get enclosingExecutableElement {
32-
for (var node in withParents) {
33-
if (node is FunctionDeclaration) {
34-
return node.declaredElement;
35-
}
36-
if (node is ConstructorDeclaration) {
37-
return node.declaredElement;
38-
}
39-
if (node is MethodDeclaration) {
40-
return node.declaredElement;
41-
}
42-
}
43-
return null;
44-
}
45-
4629
/// The [ExecutableElement2] of the enclosing executable [AstNode].
4730
ExecutableElement2? get enclosingExecutableElement2 {
4831
for (var node in withParents) {
@@ -176,10 +159,11 @@ extension AstNodeNullableExtension on AstNode? {
176159
extension CompilationUnitExtension on CompilationUnit {
177160
/// Whether this [CompilationUnit] is found in a "test" directory.
178161
bool get inTestDir {
179-
var declaredElement = this.declaredElement;
180-
if (declaredElement == null) return false;
181-
var pathContext = declaredElement.session.resourceProvider.pathContext;
182-
var path = declaredElement.source.fullName;
162+
var declaredFragment = this.declaredFragment;
163+
if (declaredFragment == null) return false;
164+
var pathContext =
165+
declaredFragment.element.session.resourceProvider.pathContext;
166+
var path = declaredFragment.source.fullName;
183167
return switch (pathContext.separator) {
184168
'/' => const [
185169
'/test/',

0 commit comments

Comments
 (0)