Merge pull request #5369 from dotty-staging/topic/ide-modules

IDE: Strip module suffix, show modules as such

Author: Duhemm

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -620,6 +620,8 @@ object DottyLanguageServer {
         SK.Package
       else if (sym.isConstructor)
         SK.Constructor
+      else if (sym.is(Module))
+        SK.Module
       else if (sym.isClass)
         SK.Class
       else if (sym.is(Mutable))
@@ -630,7 +632,7 @@ object DottyLanguageServer {
         SK.Field
     }
 
-    val name = sym.name.show
+    val name = sym.name.stripModuleClassSuffix.show
     val containerName =
       if (sym.owner.exists && !sym.owner.isEmptyPackage)
         sym.owner.name.show

language-server/test/dotty/tools/languageserver/DocumentSymbolTest.scala

@@ -26,4 +26,16 @@ class DocumentSymbolTest {
     ) .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
       .documentSymbol(m3, (m3 to m4).symInfo("Bar", SymbolKind.Class))
   }
+
+  @Test def documentSymbolShowModule: Unit = {
+    code"""object ${m1}Foo${m2}""".withSource
+      .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Module))
+  }
+
+  @Test def documentSymbolShowClassAndCompanion: Unit = {
+    code"""object ${m1}Foo${m2}
+           class ${m3}Foo${m4}""".withSource
+      .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Module),
+                          (m3 to m4).symInfo("Foo", SymbolKind.Class))
+  }
 }

language-server/test/dotty/tools/languageserver/SymbolTest.scala

@@ -27,4 +27,16 @@ class SymbolTest {
     ) .symbol("Foo", Foo.range.symInfo("Foo", SymbolKind.Class), fooFoo.range.symInfo("Foo", SymbolKind.Class, "foo"))
       .symbol("Bar", Bar.range.symInfo("Bar", SymbolKind.Class))
   }
+
+  @Test def symbolShowModule: Unit = {
+    code"""object ${m1}Foo${m2}""".withSource
+      .symbol("Foo", (m1 to m2).symInfo("Foo", SymbolKind.Module))
+  }
+
+  @Test def symbolShowClassAndCompanion: Unit = {
+    code"""object ${m1}Foo${m2}
+           class ${m3}Foo${m4}""".withSource
+      .symbol("Foo", (m1 to m2).symInfo("Foo", SymbolKind.Module),
+                     (m3 to m4).symInfo("Foo", SymbolKind.Class))
+  }
 }