Skip to content

Commit a1f5ee9

Browse files
pqCommit Queue
authored andcommitted
[element model] migrate abstract_single_unit
Change-Id: I6d717985cb6d8ddafb0f7d8b9e1428f1c5f1fa21 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403484 Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent 057426e commit a1f5ee9

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

pkg/analysis_server/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ lib/src/services/refactoring/legacy/refactoring_manager.dart
1212
lib/src/services/refactoring/legacy/rename.dart
1313
lib/src/services/refactoring/legacy/rename_import.dart
1414
lib/src/services/search/element_visitors.dart
15-
test/abstract_single_unit.dart
1615
test/services/refactoring/legacy/abstract_rename.dart
1716
test/services/search/element_visitors_test.dart

pkg/analysis_server/test/abstract_single_unit.dart

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

55
import 'package:analyzer/dart/analysis/results.dart';
66
import 'package:analyzer/dart/ast/ast.dart';
7-
import 'package:analyzer/dart/element/element.dart';
87
import 'package:analyzer/dart/element/element2.dart';
98
import 'package:analyzer/error/error.dart';
109
import 'package:analyzer/file_system/file_system.dart';
@@ -13,7 +12,6 @@ import 'package:analyzer/src/test_utilities/find_element.dart';
1312
import 'package:analyzer/src/test_utilities/find_element2.dart';
1413
import 'package:analyzer/src/test_utilities/find_node.dart';
1514
import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
16-
import 'package:analyzer/src/utilities/extensions/element.dart';
1715
import 'package:test/test.dart';
1816

1917
import 'abstract_context.dart';
@@ -26,13 +24,11 @@ class AbstractSingleUnitTest extends AbstractContextTest {
2624
late ResolvedLibraryResult? testLibraryResult;
2725
late ResolvedUnitResult testAnalysisResult;
2826
late CompilationUnit testUnit;
29-
late CompilationUnitElement testUnitElement;
30-
late LibraryElement testLibraryElement;
3127
late FindNode findNode;
3228
late FindElement findElement;
3329
late FindElement2 findElement2;
3430

35-
LibraryElement2 get testLibraryElement2 => testLibraryElement.asElement2;
31+
late LibraryElement2 testLibraryElement;
3632

3733
void addTestSource(String code) {
3834
testCode = code;
@@ -84,8 +80,8 @@ class AbstractSingleUnitTest extends AbstractContextTest {
8480
isEmpty,
8581
);
8682
}
87-
testUnitElement = testUnit.declaredElement!;
88-
testLibraryElement = testUnitElement.library;
83+
84+
testLibraryElement = testUnit.declaredFragment!.element;
8985
findNode = FindNode(testCode, testUnit);
9086
findElement = FindElement(testUnit);
9187
findElement2 = FindElement2(testUnit);

pkg/analysis_server/test/services/refactoring/legacy/extract_method_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ import 'package:ddd/ddd.dart';
332332
await addLibraryImports(
333333
testAnalysisResult.session,
334334
change,
335-
testLibraryElement2,
335+
testLibraryElement,
336336
newLibraries.toSet(),
337337
);
338338
var testEdit = change.getFileEdit(testFile.path);

pkg/analysis_server/test/services/refactoring/legacy/rename_library_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ part of the.new.name;
9393
}
9494

9595
void _createRenameRefactoring() {
96-
createRenameRefactoringForElement2(testLibraryElement2);
96+
createRenameRefactoringForElement2(testLibraryElement);
9797
}
9898
}

pkg/analysis_server/test/services/search/element_visitors_test.dart

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

55
import 'package:analysis_server/src/services/search/element_visitors.dart';
66
import 'package:analyzer/dart/element/element.dart';
7+
import 'package:analyzer/src/utilities/extensions/element.dart';
78
import 'package:test/test.dart';
89
import 'package:test_reflective_loader/test_reflective_loader.dart';
910

@@ -17,6 +18,8 @@ void main() {
1718

1819
@reflectiveTest
1920
class FindElementByNameOffsetTest extends AbstractSingleUnitTest {
21+
Element get testUnitElement => testLibraryElement.asElement;
22+
2023
Future<void> test_class() async {
2124
await resolveTestCode(r'''
2225
class AAA {}

0 commit comments

Comments
 (0)