[analysis_server] Include Class/Enum/Mixin declaration names in occurrences

Fixes Dart-Code/Dart-Code#4376.

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

Author: DanTup

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

@@ -26,13 +26,27 @@ void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
 class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   final Map<Element, List<int>> elementsOffsets = <Element, List<int>>{};
 
+  @override
+  void visitClassDeclaration(ClassDeclaration node) {
+    _addOccurrence(node.declaredElement!, node.name.offset);
+
+    super.visitClassDeclaration(node);
+  }
+
   @override
   void visitEnumConstantDeclaration(EnumConstantDeclaration node) {
     _addOccurrence(node.declaredElement!, node.name.offset);
 
     super.visitEnumConstantDeclaration(node);
   }
 
+  @override
+  void visitEnumDeclaration(EnumDeclaration node) {
+    _addOccurrence(node.declaredElement!, node.name.offset);
+
+    super.visitEnumDeclaration(node);
+  }
+
   @override
   void visitFieldFormalParameter(FieldFormalParameter node) {
     final declaredElement = node.declaredElement;
@@ -58,6 +72,13 @@ class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitMethodDeclaration(node);
   }
 
+  @override
+  void visitMixinDeclaration(MixinDeclaration node) {
+    _addOccurrence(node.declaredElement!, node.name.offset);
+
+    super.visitMixinDeclaration(node);
+  }
+
   @override
   void visitSimpleFormalParameter(SimpleFormalParameter node) {
     final nameToken = node.name;

pkg/analysis_server/test/analysis/notification_occurrences_test.dart

@@ -126,6 +126,7 @@ void f(E e) {
     expect(testOccurrences.element.name, 'E');
     assertHasOffset('E e');
     assertHasOffset('E.v');
+    assertHasOffset('E {');
   }
 
   Future<void> test_enum_constant() async {
@@ -301,6 +302,20 @@ void f() {
     assertHasOffset('mmm(); // b');
   }
 
+  Future<void> test_mixin() async {
+    addTestFile('''
+mixin A { // 1
+  void aaa() {}
+}
+class B with A {}
+''');
+    await prepareOccurrences();
+    assertHasRegion('A { // 1');
+    expect(testOccurrences.element.kind, ElementKind.MIXIN);
+    expect(testOccurrences.element.name, 'A');
+    assertHasOffset('A {}');
+  }
+
   Future<void> test_parameter_named() async {
     addTestFile('''
 void f(int aaa, int bbb, {int? ccc, int? ddd}) {
@@ -381,6 +396,18 @@ int VVV = 4;
     assertHasOffset('int VVV');
   }
 
+  Future<void> test_type_class_definition() async {
+    addTestFile('''
+class A {}
+A a;
+''');
+    await prepareOccurrences();
+    assertHasRegion('A a');
+    expect(testOccurrences.element.kind, ElementKind.CLASS);
+    expect(testOccurrences.element.name, 'A');
+    assertHasOffset('A {}');
+  }
+
   Future<void> test_type_dynamic() async {
     addTestFile('''
 void f() {