Elements. Finish remaining analyzer_use_new_elements in DAS.
Change-Id: I37847bebf81da99d30c006f4d4dfd95805eada11
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415820
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart
index 1038623..b4c853f 100644
--- a/pkg/analysis_server/lib/src/cider/rename.dart
+++ b/pkg/analysis_server/lib/src/cider/rename.dart
@@ -35,10 +35,10 @@
this.filePath,
);
- String get oldName => refactoringElement.element2.displayName;
+ String get oldName => refactoringElement.element.displayName;
CheckNameResponse? checkNewName(String name) {
- var element = refactoringElement.element2;
+ var element = refactoringElement.element;
RefactoringStatus? status;
if (element is FormalParameterElement) {
@@ -125,11 +125,11 @@
LineInfo get lineInfo => canRename.lineInfo;
- String get oldName => canRename.refactoringElement.element2.displayName;
+ String get oldName => canRename.refactoringElement.element.displayName;
Future<RenameResponse?> computeRenameRanges2() async {
var elements = <Element2>[];
- var element = canRename.refactoringElement.element2;
+ var element = canRename.refactoringElement.element;
if (element is PropertyInducingElement2 && element.isSynthetic) {
var property = element;
var getter = property.getter2;
@@ -362,7 +362,7 @@
}
Future<CiderReplaceMatch?> _replaceSyntheticConstructor() async {
- var element = canRename.refactoringElement.element2;
+ var element = canRename.refactoringElement.element;
var interfaceElement = element.enclosingElement2!;
var fileResolver = canRename._fileResolver;
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
index 5754815..21c06ab 100644
--- a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
+++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
@@ -78,7 +78,7 @@
var refactoring = RenameRefactoring.create(
server.refactoringWorkspace,
unit,
- refactorDetails.element2,
+ refactorDetails.element,
);
if (refactoring == null) {
return success(null);
@@ -173,7 +173,7 @@
var refactoring = RenameRefactoring.create(
server.refactoringWorkspace,
unit,
- refactorDetails.element2,
+ refactorDetails.element,
);
if (refactoring == null) {
return success(null);
diff --git a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
index 1416332..a0a82c9 100644
--- a/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
+++ b/pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
@@ -2,12 +2,8 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// ignore_for_file: analyzer_use_new_elements
-
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:analyzer/src/workspace/blaze.dart';
import 'package:path/path.dart' show relative;
@@ -121,12 +117,7 @@
CiderKytheHelper(this.resourceProvider, this.corpus, this.sdkRootPath);
/// Returns a URI that can be used to query Kythe.
- String toKytheUri(Element e) {
- return toKytheUri2(e.asElement2!);
- }
-
- /// Returns a URI that can be used to query Kythe.
- String toKytheUri2(Element2 e) {
+ String toKytheUri(Element2 e) {
var nodeKind = _getNodeKind(e) ?? schema.RECORD_KIND;
var vname = _vNameFromElement(e, nodeKind);
return 'kythe://$corpus?lang=dart?path=${vname.path}#${vname.signature}';
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
index 613a678..c861467 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart
@@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-// ignore_for_file: analyzer_use_new_elements
-
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/refactoring/legacy/convert_getter_to_method.dart';
import 'package:analysis_server/src/services/refactoring/legacy/convert_method_to_getter.dart';
@@ -28,7 +26,6 @@
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -633,15 +630,9 @@
}
class RenameRefactoringElement {
- final Element2 _element2;
+ final Element2 element;
final int offset;
final int length;
- RenameRefactoringElement(this._element2, this.offset, this.length);
-
- Element get element => element2.asElement!;
-
- Element2 get element2 {
- return _element2;
- }
+ RenameRefactoringElement(this.element, this.offset, this.length);
}
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
index 5a452db..e4a93db 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
@@ -330,7 +330,7 @@
refactoring = RenameRefactoring.create(
refactoringWorkspace,
resolvedUnit,
- renameElement.element2,
+ renameElement.element,
);
feedback = RenameFeedback(
renameElement.offset,
diff --git a/pkg/analysis_server/test/src/cider/rename_test.dart b/pkg/analysis_server/test/src/cider/rename_test.dart
index dfe172b..1cb4545 100644
--- a/pkg/analysis_server/test/src/cider/rename_test.dart
+++ b/pkg/analysis_server/test/src/cider/rename_test.dart
@@ -45,7 +45,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'Old');
+ expect(refactor!.refactoringElement.element.name3, 'Old');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -59,7 +59,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'bar');
+ expect(refactor!.refactoringElement.element.name3, 'bar');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -71,7 +71,7 @@
''');
expect(refactor, isNotNull);
- expect(refactor!.refactoringElement.element2.name3, '_val');
+ expect(refactor!.refactoringElement.element.name3, '_val');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -81,7 +81,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'foo');
+ expect(refactor!.refactoringElement.element.name3, 'foo');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -97,7 +97,7 @@
''');
expect(refactor, isNotNull);
- expect(refactor!.refactoringElement.element2.name3, 'myLabel');
+ expect(refactor!.refactoringElement.element.name3, 'myLabel');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -108,7 +108,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'a');
+ expect(refactor!.refactoringElement.element.name3, 'a');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -119,7 +119,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'foo');
+ expect(refactor!.refactoringElement.element.name3, 'foo');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -141,7 +141,7 @@
''');
expect(refactor, isNotNull);
- expect(refactor!.refactoringElement.element2.name3, 'bar');
+ expect(refactor!.refactoringElement.element.name3, 'bar');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
@@ -154,7 +154,7 @@
}
''');
- expect(refactor!.refactoringElement.element2.name3, 'test');
+ expect(refactor!.refactoringElement.element.name3, 'test');
expect(refactor.refactoringElement.offset, _correctionContext.offset);
}
