Show documentation for value forwarders in completions (#19200)

This was changed in #18874 connected to scalameta/metals#5885
scala · Dec 6, 2023 · 96e2720 · 96e2720
2 parents 7480582 + 601922a
commit 96e2720
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala b/presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala
@@ -69,6 +69,8 @@ object CompletionItemResolver extends ItemResolver:
               fullDocstring(tr.symbol, search)
             case _ =>
               ""
+        else if gsym.isTerm && gsym.info.typeSymbol.is(Module) then
+          fullDocstring(gsym.info.typeSymbol.companion, search)
         else ""
       else gsymDoc
     else

diff --git a/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala b/presentation-compiler/src/main/dotty/tools/pc/completions/CompletionValue.scala
@@ -100,6 +100,8 @@ object CompletionValue:
           s"${labelWithSuffix(printer)} -${description(printer)}"
         else s"${labelWithSuffix(printer)}${description(printer)}"
       else if symbol.isType then labelWithSuffix(printer)
+      else if symbol.isTerm && symbol.info.typeSymbol.is(Module) then
+        s"${label}${description(printer)}"
       else s"$label: ${description(printer)}"
 
     private def labelWithSuffix(printer: ShortenedTypePrinter)(using Context): String =

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionDocSuite.scala
@@ -214,7 +214,7 @@ class CompletionDocSuite extends BaseCompletionSuite:
       """.stripMargin,
       """
         |> Found documentation for scala/package.Vector.
-        |Vector:  scala.collection.immutable
+        |Vector scala.collection.immutable
         |""".stripMargin,
       includeDocs = true
     )

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala
@@ -25,7 +25,7 @@ class CompletionSuite extends BaseCompletionSuite:
         |  Lis@@
         |}""".stripMargin,
       """
-        |List:  scala.collection.immutable
+        |List scala.collection.immutable
         |List - java.awt
         |List - java.util
         |List - scala.collection.immutable
@@ -647,7 +647,7 @@ class CompletionSuite extends BaseCompletionSuite:
           |}
           |""".stripMargin,
       """|None scala
-         |NoManifest:  scala.reflect
+         |NoManifest scala.reflect
          |""".stripMargin,
       topLines = Some(2)
     )
@@ -660,8 +660,8 @@ class CompletionSuite extends BaseCompletionSuite:
           |}
           |""".stripMargin,
       """|Some(value) scala
-         |Seq:  scala.collection.immutable
-         |Set:  scala.collection.immutable
+         |Seq scala.collection.immutable
+         |Set scala.collection.immutable
          |""".stripMargin,
       topLines = Some(3)
     )