[DAS] Fixes occurrences for extension and type parameters

Fixes: #60449
Change-Id: Ie862deea3d3d37890f1f610c7c83509fe82b2a40
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419423
Reviewed-by: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>

Author: FMorschel

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

@@ -123,6 +123,22 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitEnumDeclaration(node);
   }
 
+  @override
+  void visitExtensionDeclaration(ExtensionDeclaration node) {
+    if (node case ExtensionDeclaration(:var declaredFragment?, :var name?)) {
+      _addOccurrence(declaredFragment.element, name);
+    }
+
+    super.visitExtensionDeclaration(node);
+  }
+
+  @override
+  void visitExtensionOverride(ExtensionOverride node) {
+    _addOccurrence(node.element2, node.name);
+
+    super.visitExtensionOverride(node);
+  }
+
   @override
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
     _addOccurrence(node.declaredFragment!.element, node.name);
@@ -146,6 +162,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitFunctionDeclaration(FunctionDeclaration node) {
     _addOccurrence(node.declaredFragment!.element, node.name);
+
     super.visitFunctionDeclaration(node);
   }
 
@@ -173,6 +190,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
     _addOccurrence(node.declaredFragment!.element, node.name);
+
     super.visitMethodDeclaration(node);
   }
 
@@ -252,6 +270,15 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitSuperFormalParameter(node);
   }
 
+  @override
+  void visitTypeParameter(TypeParameter node) {
+    if (node case TypeParameter(:var declaredFragment?)) {
+      _addOccurrence(declaredFragment.element, node.name);
+    }
+
+    super.visitTypeParameter(node);
+  }
+
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
     _addOccurrence(node.declaredFragment!.element, node.name);

pkg/analysis_server/test/analysis/notification_occurrences_test.dart

@@ -215,6 +215,18 @@ void f(E e) {
       ''');
   }
 
+  Future<void> test_extension() async {
+    await assertOccurrences(kind: ElementKind.EXTENSION, '''
+void foo(int i) {
+  /*[0*/E/*0]*/(i).self;
+}
+
+extension /*[1*/E/*1]*/<ThisType> on ThisType {
+  ThisType get self => this;
+}
+''');
+  }
+
   Future<void> test_extensionType() async {
     await assertOccurrences(kind: ElementKind.EXTENSION_TYPE, '''
 extension type /*[0*/E/*0]*/(int it) {}
@@ -734,4 +746,64 @@ void f() {
     var offset = findOffset('void f()');
     findRegion(offset, 'void'.length, exists: false);
   }
+
+  Future<void> test_typeParameter_class() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+abstract class A</*[0*/ThisType/*0]*/> {
+  /*[1*/ThisType/*1]*/ f();
+}
+''');
+  }
+
+  Future<void> test_typeParameter_enum() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+enum E</*[0*/ThisType/*0]*/> {
+  a;
+
+  /*[1*/ThisType/*1]*/ get t => throw UnimplementedError();
+}
+''');
+  }
+
+  Future<void> test_typeParameter_extension() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+extension E</*[0*/ThisType/*0]*/> on /*[1*/ThisType/*1]*/ {
+  /*[2*/ThisType/*2]*/ f() => this;
+}
+''');
+  }
+
+  Future<void> test_typeParameter_extensionType() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+extension type Et</*[0*/ThisType/*0]*/>(/*[1*/ThisType/*1]*/ value) {
+  /*[2*/ThisType/*2]*/ get v => value;
+}
+''');
+  }
+
+  Future<void> test_typeParameter_function() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+/*[0*/ThisType/*0]*/ f</*[1*/ThisType/*1]*/>() => 0 as /*[2*/ThisType/*2]*/;
+''');
+  }
+
+  Future<void> test_typeParameter_functionParameter() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+void f(/*[0*/ThisType/*0]*/ Function</*[1*/ThisType/*1]*/>() f) => f();
+''');
+  }
+
+  Future<void> test_typeParameter_mixin() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+mixin M</*[0*/ThisType/*0]*/> {
+  /*[1*/ThisType/*1]*/ get t;
+}
+''');
+  }
+
+  Future<void> test_typeParameter_typedef() async {
+    await assertOccurrences(kind: ElementKind.TYPE_PARAMETER, '''
+typedef TypeDef</*[0*/ThisType/*0]*/> = /*[1*/ThisType/*1]*/ Function(/*[2*/ThisType/*2]*/);
+''');
+  }
 }