|
2 | 2 | // for details. All rights reserved. Use of this source code is governed by a |
3 | 3 | // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
|
5 | | -// ignore_for_file: analyzer_use_new_elements |
6 | | - |
7 | 5 | import 'package:analysis_server/src/services/correction/namespace.dart'; |
8 | 6 | import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart'; |
9 | 7 | import 'package:analyzer/dart/ast/ast.dart'; |
10 | | -import 'package:analyzer/dart/element/element.dart'; |
11 | 8 | import 'package:analyzer/dart/element/element2.dart'; |
12 | 9 | import 'package:analyzer/src/dart/ast/element_locator.dart'; |
13 | 10 | import 'package:analyzer/src/utilities/extensions/element.dart'; |
@@ -41,43 +38,24 @@ class RenameRefactoringTest extends RefactoringTest { |
41 | 38 | expect(expectedOffsets, isEmpty); |
42 | 39 | } |
43 | 40 |
|
44 | | - /// Creates a new [RenameRefactoring] in [refactoring] for the [Element] of |
| 41 | + /// Creates a new [RenameRefactoring] in [refactoring] for the element of |
45 | 42 | /// the [SimpleIdentifier] at the given [search] pattern. |
46 | 43 | void createRenameRefactoringAtString(String search) { |
47 | 44 | var node = findNode.any(search); |
48 | 45 |
|
49 | | - Element? element; |
| 46 | + Element2? element; |
50 | 47 | switch (node) { |
51 | | - case ExportDirective(): |
52 | | - element = node.element; |
53 | 48 | case ImportDirective(): |
54 | | - element = node.element; |
55 | | - case PartOfDirective(): |
56 | | - element = node.element; |
| 49 | + element = MockLibraryImportElement(node.libraryImport!); |
57 | 50 | default: |
58 | | - element = ElementLocator.locate2(node).asElement; |
| 51 | + element = ElementLocator.locate2(node); |
59 | 52 | } |
60 | 53 |
|
61 | | - if (node is SimpleIdentifier && element is PrefixElement) { |
62 | | - element = getImportElement(node); |
| 54 | + if (node is SimpleIdentifier && element is PrefixElement2) { |
| 55 | + element = MockLibraryImportElement(getImportElement2(node)!); |
63 | 56 | } |
64 | 57 |
|
65 | | - createRenameRefactoringForElement(element); |
66 | | - } |
67 | | - |
68 | | - /// Creates a new [RenameRefactoring] in [refactoring] for [element]. |
69 | | - /// Fails if no [RenameRefactoring] can be created. |
70 | | - void createRenameRefactoringForElement(Element? element) { |
71 | | - var workspace = RefactoringWorkspace([driverFor(testFile)], searchEngine); |
72 | | - var refactoring = RenameRefactoring.create( |
73 | | - workspace, |
74 | | - testAnalysisResult, |
75 | | - element, |
76 | | - ); |
77 | | - if (refactoring == null) { |
78 | | - fail("No refactoring for '$element'."); |
79 | | - } |
80 | | - this.refactoring = refactoring; |
| 58 | + createRenameRefactoringForElement2(element); |
81 | 59 | } |
82 | 60 |
|
83 | 61 | /// Creates a new [RenameRefactoring] in [refactoring] for [element]. |
|
0 commit comments