Skip to content

Commit bd76c51

Browse files
DanTupCommit Queue
authored and
Commit Queue
committed
[analysis_server] Migrate Code Actions + Refactor base to new Element model
Change-Id: I6393f60abef6adae34c9f1b9a028662746da0612 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/399960 Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 189fee4 commit bd76c51

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

pkg/analysis_server/analyzer_use_new_elements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ lib/src/handler/legacy/edit_get_available_refactorings.dart
88
lib/src/handler/legacy/search_find_element_references.dart
99
lib/src/handler/legacy/search_get_type_hierarchy.dart
1010
lib/src/lsp/completion_utils.dart
11-
lib/src/lsp/handlers/code_actions/dart.dart
12-
lib/src/lsp/handlers/commands/abstract_refactor.dart
1311
lib/src/lsp/handlers/handler_completion.dart
1412
lib/src/lsp/handlers/handler_completion_resolve.dart
1513
lib/src/lsp/handlers/handler_definition.dart

pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import 'package:analyzer/dart/analysis/session.dart'
2323
show InconsistentAnalysisException;
2424
import 'package:analyzer/dart/element/element2.dart';
2525
import 'package:analyzer/src/dart/ast/utilities.dart';
26-
import 'package:analyzer/src/utilities/extensions/element.dart';
2726

2827
/// Produces [CodeAction]s from Dart source commands, fixes, assists and
2928
/// refactors from the server.
@@ -323,7 +322,7 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
323322
// Converts/Rewrites
324323
if (shouldIncludeKind(CodeActionKind.RefactorRewrite)) {
325324
var node = NodeLocator(offset).searchWithin(unitResult.unit);
326-
var element = server.getElementOfNode(node).asElement2;
325+
var element = server.getElementOfNode2(node);
327326

328327
// Getter to Method
329328
if (element is GetterElement &&

pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart
1616
import 'package:analyzer/dart/analysis/results.dart';
1717
import 'package:analyzer/dart/element/element2.dart';
1818
import 'package:analyzer/src/dart/ast/utilities.dart';
19-
import 'package:analyzer/src/utilities/extensions/element.dart';
2019

2120
final _manager = LspRefactorManager._();
2221

@@ -127,7 +126,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
127126

128127
case RefactoringKind.CONVERT_GETTER_TO_METHOD:
129128
var node = NodeLocator(offset).searchWithin(result.unit);
130-
var element = server.getElementOfNode(node).asElement2;
129+
var element = server.getElementOfNode2(node);
131130
if (element is GetterElement) {
132131
var refactor = ConvertGetterToMethodRefactoring(
133132
server.refactoringWorkspace,
@@ -143,7 +142,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
143142

144143
case RefactoringKind.CONVERT_METHOD_TO_GETTER:
145144
var node = NodeLocator(offset).searchWithin(result.unit);
146-
var element = server.getElementOfNode(node).asElement2;
145+
var element = server.getElementOfNode2(node);
147146
if (element is ExecutableElement2) {
148147
var refactor = ConvertMethodToGetterRefactoring(
149148
server.refactoringWorkspace,

0 commit comments

Comments
 (0)