[DAS] Better docs auto-complete with extensions and typedefs

Fixes: #60423
Change-Id: I0907a52a0c7787adc3de21c82bb60aced8263d2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419422
Reviewed-by: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Paul Berry <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -1742,6 +1742,10 @@ class DeclarationHelper {
           importData: importData,
           element: element,
           matcherScore: matcherScore,
+          kind:
+              preferNonInvocation
+                  ? CompletionSuggestionKind.IDENTIFIER
+                  : CompletionSuggestionKind.INVOCATION,
         );
         collector.addSuggestion(suggestion);
       }

pkg/analysis_server/lib/src/services/completion/dart/in_scope_completion_pass.dart

@@ -2265,8 +2265,9 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
             var helper = declarationHelper(
               mustBeAssignable: mustBeAssignable,
               preferNonInvocation:
-                  element is InterfaceElement2 &&
-                  state.request.shouldSuggestTearOff(element),
+                  node.parent is CommentReference ||
+                  (element is InterfaceElement2 &&
+                      state.request.shouldSuggestTearOff(element)),
             );
             if (node.parent is CommentReference) {
               if (element is InterfaceElement2) {

pkg/analysis_server/test/services/completion/dart/location/dart_doc_test.dart

@@ -40,7 +40,7 @@ class MyClass1 {
     assertResponse(r'''
 suggestions
   constructor1
-    kind: constructorInvocation
+    kind: constructor
 ''');
   }
 
@@ -87,7 +87,22 @@ replacement
   left: 3
 suggestions
   MyExt
-    kind: extensionInvocation
+    kind: extension
+''');
+  }
+
+  Future<void> test_extension2() async {
+    allowedIdentifiers = const {'isEven'};
+    await computeSuggestions('''
+/// This doc should suggest other things like [int.isE^].
+extension MyExt on int {}
+''');
+    assertResponse(r'''
+replacement
+  left: 3
+suggestions
+  isEven
+    kind: getter
 ''');
   }
 
@@ -368,6 +383,21 @@ suggestions
 ''');
   }
 
+  Future<void> test_typedef2() async {
+    allowedIdentifiers = const {'delayed'};
+    await computeSuggestions('''
+/// This doc should suggest other things like [Future.de^].
+typedef MyTypedef = int Function();
+''');
+    assertResponse(r'''
+replacement
+  left: 2
+suggestions
+  delayed
+    kind: constructor
+''');
+  }
+
   Future<void> test_typeParameter() async {
     allowedIdentifiers = const {'TypeParam'};
     await computeSuggestions('''

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -160,13 +160,6 @@ sealed class AnnotatedNodeImpl extends AstNodeImpl with _AnnotatedNodeMixin {
     return metadataToken;
   }
 
-  @override
-  ChildEntities get _childEntities {
-    return ChildEntities()
-      ..addNode('documentationComment', documentationComment)
-      ..addNodeList('metadata', metadata);
-  }
-
   @override
   void visitChildren(AstVisitor visitor) {
     _visitCommentAndAnnotations(visitor);
@@ -6737,7 +6730,7 @@ final class ExtensionDeclarationImpl extends CompilationUnitMemberImpl
   }
 
   @override
-  ChildEntities get _childEntities => ChildEntities()
+  ChildEntities get _childEntities => super._childEntities
     ..addToken('augmentKeyword', augmentKeyword)
     ..addToken('extensionKeyword', extensionKeyword)
     ..addToken('name', name)
@@ -9452,8 +9445,7 @@ final class GenericTypeAliasImpl extends TypeAliasImpl
   }
 
   @override
-  ChildEntities get _childEntities => ChildEntities()
-    ..addNodeList('metadata', metadata)
+  ChildEntities get _childEntities => super._childEntities
     ..addToken('augmentKeyword', augmentKeyword)
     ..addToken('typedefKeyword', typedefKeyword)
     ..addToken('name', name)
@@ -13327,9 +13319,7 @@ sealed class NormalFormalParameterImpl extends FormalParameterImpl
 
   @override
   ChildEntities get _childEntities {
-    return ChildEntities()
-      ..addNode('documentationComment', documentationComment)
-      ..addNodeList('metadata', metadata)
+    return super._childEntities
       ..addToken('requiredKeyword', requiredKeyword)
       ..addToken('covariantKeyword', covariantKeyword);
   }
@@ -19446,6 +19436,14 @@ base mixin _AnnotatedNodeMixin on AstNodeImpl implements AnnotatedNode {
     ]..sort(AstNode.LEXICAL_ORDER);
   }
 
+  @override
+  @mustCallSuper
+  ChildEntities get _childEntities {
+    return ChildEntities()
+      ..addNode('documentationComment', documentationComment)
+      ..addNodeList('metadata', metadata);
+  }
+
   /// Returns `true` if there are no annotations before the comment.
   ///
   /// Note that a result of `true` doesn't imply that there's a comment, nor