[DAS] Fixes extension and typedef dart docs

[email protected]

Bug: #59724
Change-Id: I9a4a7390e71b1e1fd2daa0f3e548f28cd34834cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411380
Reviewed-by: Samuel Rawlins <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: FMorschel

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

@@ -677,6 +677,11 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     }
   }
 
+  @override
+  void visitComment(Comment node) {
+    node.visitChildren(this);
+  }
+
   @override
   void visitCommentReference(CommentReference node) {
     collector.completionLocation = 'CommentReference_identifier';
@@ -1128,6 +1133,8 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     if (offset == node.offset) {
       _forCompilationUnitMemberBefore(node);
       return;
+    } else if (node.documentationComment.coversOffset(offset)) {
+      return node.documentationComment?.accept(this);
     } else if (offset < node.extensionKeyword.offset) {
       // There are no modifiers for extensions.
       return;
@@ -1519,6 +1526,8 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     } else if (offset >= node.equals.end && offset <= node.semicolon.offset) {
       collector.completionLocation = 'GenericTypeAlias_type';
       _forTypeAnnotation(node);
+    } else if (node.documentationComment.coversOffset(offset)) {
+      node.documentationComment?.accept(this);
     }
   }
 

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

@@ -61,7 +61,6 @@ suggestions
 ''');
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/59724')
   Future<void> test_extension() async {
     allowedIdentifiers = const {'MyExt'};
     await computeSuggestions('''
@@ -73,7 +72,7 @@ replacement
   left: 3
 suggestions
   MyExt
-    kind: extension
+    kind: extensionInvocation
 ''');
   }
 
@@ -304,7 +303,6 @@ suggestions
 ''');
   }
 
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/59724')
   Future<void> test_typedef() async {
     allowedIdentifiers = const {'MyTypedef'};
     await computeSuggestions('''
@@ -316,7 +314,7 @@ replacement
   left: 3
 suggestions
   MyTypedef
-    kind: typedef
+    kind: typeAlias
 ''');
   }
 

pkg/analyzer_plugin/lib/src/utilities/completion/completion_target.dart

@@ -512,6 +512,13 @@ class CompletionTarget {
               containingNode.parent.ifTypeOrNull() ??
                   // SimpleString -> Configuration -> Directive
                   containingNode.parent?.parent.ifTypeOrNull();
+        } else if (containingNode is Comment) {
+          for (var reference in containingNode.references) {
+            if (reference.offset <= requestOffset &&
+                reference.end >= requestOffset) {
+              return SourceRange(reference.offset, reference.length);
+            }
+          }
         }
         // Replacement range for a URI.
         if (directive != null && uri is SimpleStringLiteral) {