[Migration] occurrences_dart.dart

Change-Id: I55f821655ed5f2430e752748231bdf1a1c0279e0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402840
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -1,7 +1,6 @@
 lib/plugin/protocol/protocol_dart.dart
 lib/src/analysis_server.dart
 lib/src/cider/rename.dart
-lib/src/domains/analysis/occurrences_dart.dart
 lib/src/handler/legacy/edit_get_available_refactorings.dart
 lib/src/handler/legacy/search_find_element_references.dart
 lib/src/lsp/handlers/handler_completion.dart

pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart

@@ -6,27 +6,27 @@ import 'package:analysis_server/plugin/analysis/occurrences/occurrences_core.dar
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 
 void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
   var visitor = _DartUnitOccurrencesComputerVisitor();
   unit.accept(visitor);
   visitor.elementsOffsets.forEach((engineElement, offsets) {
-    var length = engineElement.nameLength;
-    var serverElement = protocol.convertElement(engineElement);
+    var length = engineElement.name3?.length ?? 0;
+    var serverElement = protocol.convertElement2(engineElement);
     var occurrences = protocol.Occurrences(serverElement, offsets, length);
     collector.addOccurrences(occurrences);
   });
 }
 
 class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
-  final Map<Element, List<int>> elementsOffsets = <Element, List<int>>{};
+  final Map<Element2, List<int>> elementsOffsets = {};
 
   @override
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
-    var element = node.element;
+    var element = node.element2;
     if (element != null) {
       _addOccurrence(element, node.name.offset);
     }
@@ -36,67 +36,67 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitClassDeclaration(node);
   }
 
   @override
   void visitClassTypeAlias(ClassTypeAlias node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitClassTypeAlias(node);
   }
 
   @override
   void visitConstructorDeclaration(ConstructorDeclaration node) {
     if (node.name case var name?) {
-      _addOccurrence(node.declaredElement!, name.offset);
+      _addOccurrence(node.declaredFragment!.element, name.offset);
     }
 
     super.visitConstructorDeclaration(node);
   }
 
   @override
   void visitDeclaredIdentifier(DeclaredIdentifier node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitDeclaredIdentifier(node);
   }
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredElement2!, node.name.offset);
 
     super.visitDeclaredVariablePattern(node);
   }
 
   @override
   void visitEnumConstantDeclaration(EnumConstantDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitEnumConstantDeclaration(node);
   }
 
   @override
   void visitEnumDeclaration(EnumDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitEnumDeclaration(node);
   }
 
   @override
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitExtensionTypeDeclaration(node);
   }
 
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
-    var declaredElement = node.declaredElement;
-    if (declaredElement is FieldFormalParameterElement) {
-      var field = declaredElement.field;
+    var declaredElement = node.declaredFragment?.element;
+    if (declaredElement is FieldFormalParameterElement2) {
+      var field = declaredElement.field2;
       if (field != null) {
         _addOccurrence(field, node.name.offset);
       }
@@ -107,40 +107,40 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitFunctionDeclaration(FunctionDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
     super.visitFunctionDeclaration(node);
   }
 
   @override
   void visitFunctionTypeAlias(FunctionTypeAlias node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitFunctionTypeAlias(node);
   }
 
   @override
   void visitGenericTypeAlias(GenericTypeAlias node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitGenericTypeAlias(node);
   }
 
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
     super.visitMethodDeclaration(node);
   }
 
   @override
   void visitMixinDeclaration(MixinDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
 
     super.visitMixinDeclaration(node);
   }
 
   @override
   void visitNamedType(NamedType node) {
-    var element = node.element;
+    var element = node.element2;
     if (element != null) {
       _addOccurrence(element, node.name2.offset);
     }
@@ -150,7 +150,7 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitPatternField(PatternField node) {
-    var element = node.element;
+    var element = node.element2;
     var pattern = node.pattern;
     // If no explicit field name, use the variables name.
     var name =
@@ -166,7 +166,10 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitRepresentationDeclaration(RepresentationDeclaration node) {
     if (node.constructorName case var constructorName?) {
-      _addOccurrence(node.constructorElement!, constructorName.name.offset);
+      _addOccurrence(
+        node.constructorFragment!.element,
+        constructorName.name.offset,
+      );
     }
 
     super.visitRepresentationDeclaration(node);
@@ -176,15 +179,15 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   void visitSimpleFormalParameter(SimpleFormalParameter node) {
     var nameToken = node.name;
     if (nameToken != null) {
-      _addOccurrence(node.declaredElement!, nameToken.offset);
+      _addOccurrence(node.declaredFragment!.element, nameToken.offset);
     }
 
     super.visitSimpleFormalParameter(node);
   }
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
-    var element = node.writeOrReadElement;
+    var element = node.writeOrReadElement2;
     if (element != null) {
       _addOccurrence(element, node.offset);
     }
@@ -193,17 +196,17 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitSuperFormalParameter(SuperFormalParameter node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
     super.visitSuperFormalParameter(node);
   }
 
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
-    _addOccurrence(node.declaredElement!, node.name.offset);
+    _addOccurrence(node.declaredFragment!.element, node.name.offset);
     super.visitVariableDeclaration(node);
   }
 
-  void _addOccurrence(Element element, int offset) {
+  void _addOccurrence(Element2 element, int offset) {
     var canonicalElement = _canonicalizeElement(element);
     if (canonicalElement == null || element == DynamicElementImpl.instance) {
       return;
@@ -216,13 +219,13 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     offsets.add(offset);
   }
 
-  Element? _canonicalizeElement(Element element) {
-    Element? canonicalElement = element;
-    if (canonicalElement is FieldFormalParameterElement) {
-      canonicalElement = canonicalElement.field;
-    } else if (canonicalElement is PropertyAccessorElement) {
-      canonicalElement = canonicalElement.variable2;
+  Element2? _canonicalizeElement(Element2 element) {
+    Element2? canonicalElement = element;
+    if (canonicalElement is FieldFormalParameterElement2) {
+      canonicalElement = canonicalElement.field2;
+    } else if (canonicalElement is PropertyAccessorElement2) {
+      canonicalElement = canonicalElement.variable3;
     }
-    return canonicalElement?.declaration;
+    return canonicalElement?.baseElement;
   }
 }

pkg/analysis_server/lib/src/protocol_server.dart

@@ -477,8 +477,15 @@ Location _locationForArgs(
 }
 
 /// Creates a new [Location].
-Location _locationForArgs2(engine.Fragment fragment, engine.SourceRange range) {
-  var lineInfo = fragment.libraryFragment!.lineInfo;
+Location? _locationForArgs2(
+  engine.Fragment fragment,
+  engine.SourceRange range,
+) {
+  var libraryFragment = fragment.libraryFragment;
+  if (libraryFragment == null) {
+    return null;
+  }
+  var lineInfo = libraryFragment.lineInfo;
 
   var startLocation = lineInfo.getLocation(range.offset);
   var endLocation = lineInfo.getLocation(range.end);

pkg/analysis_server/test/analysis/notification_occurrences_test.dart

@@ -655,16 +655,13 @@ class /*[0*/A/*0]*/ {}
   }
 
   Future<void> test_type_dynamic() async {
-    addTestFile('''
+    await assertOccurrences(kind: ElementKind.UNKNOWN, '''
 void f() {
-  dynamic a = 1;
-  dynamic b = 2;
+  /*[0*/dynamic/*0]*/ a = 1;
+  /*[1*/dynamic/*1]*/ b = 2;
 }
-dynamic V = 3;
+/*[2*/dynamic/*2]*/ V = 3;
 ''');
-    await prepareOccurrences();
-    var offset = findOffset('dynamic a');
-    findRegion(offset, 'dynamic'.length, exists: false);
   }
 
   Future<void> test_type_void() async {