deduplicate docs for symbol and its companion

scalameta · Dec 4, 2024 · 2a7e016 · 2a7e016
1 parent ff1ac2d
commit 2a7e016
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/CompletionItemResolver.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/CompletionItemResolver.scala
@@ -75,7 +75,7 @@ class CompletionItemResolver(
       }
     } else {
       val companionDoc = docs(companion)
-      if (companionDoc.isEmpty) gsymDoc
+      if (companionDoc.isEmpty || companionDoc == gsymDoc) gsymDoc
       else if (gsymDoc.isEmpty) companionDoc
       else {
         List(

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/CompletionItemResolver.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/CompletionItemResolver.scala
@@ -71,7 +71,7 @@ object CompletionItemResolver extends ItemResolver:
       else gsymDoc
     else
       val companionDoc = docs(companion)
-      if companionDoc.isEmpty then gsymDoc
+      if companionDoc.isEmpty || companionDoc == gsymDoc then gsymDoc
       else if gsymDoc.isEmpty then companionDoc
       else
         List(

diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpSuite.scala
@@ -520,7 +520,7 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite {
       |
       |
     """.stripMargin,
-    """|apply(viewId: String, nodeUri: String, label: String, command: String = ..., icon: String = ..., tooltip: String = ..., collapseState: String = ...): TreeViewNode
+    """|apply(viewId: String, nodeUri: String, label: String, command: String = null, icon: String = null, tooltip: String = null, collapseState: String = null): TreeViewNode
        |      ^^^^^^^^^^^^^^
        |""".stripMargin,
     compat = Map(