all package objects are named 'package'

Author: bishabosha

compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala

@@ -102,7 +102,10 @@ class ExtractSemanticDB extends Phase {
         else if sym.is(Param) then
           b.append('('); addName(sym.name); b.append(')')
         else
-          addName(sym.name)
+          if (sym.isPackageObject) then
+            b.append("package")
+          else
+            addName(sym.name)
           if sym.is(Package) then b.append('/')
           else if sym.isType then b.append('#')
           else if sym.isOneOf(Method | Mutable)
@@ -134,6 +137,7 @@ class ExtractSemanticDB extends Phase {
           addOwner(sym.owner); addDescriptor(sym)
         else
           b.append("local").append(localIdx(sym))
+
     end addSymName
 
     /** The semanticdb name of the given symbol */

compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala

@@ -65,7 +65,7 @@ class SemanticdbTests {
       "-Ysemanticdb",
       "-d", target.toString,
       // "-Ydebug",
-      "-Xprint:extractSemanticDB",
+      // "-Xprint:extractSemanticDB",
       "-sourceroot", src.toString,
       "-usejavacp",
     ) ++ inputFiles().map(_.toString)

tests/semanticdb/toplevel.expect.scala

@@ -1,5 +1,5 @@
-inline val a = "/*<<=_empty_.toplevel$package.*//*<<=_empty_.toplevel$package.a.*/"
-def (x: Int/*<<=_empty_.toplevel$package.combine().*//*<<=_empty_.toplevel$package.combine().(x)*//*=>>scala.Int#*/) combine (y/*<<=_empty_.toplevel$package.combine().(y)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.toplevel$package.combine().(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.toplevel$package.combine().(y)*/
-def combine/*<<=_empty_.toplevel$package.combine(+1).*/(x/*<<=_empty_.toplevel$package.combine(+1).(x)*/: Int/*=>>scala.Int#*/, y/*<<=_empty_.toplevel$package.combine(+1).(y)*/: Int/*=>>scala.Int#*/, z/*<<=_empty_.toplevel$package.combine(+1).(z)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.toplevel$package.combine(+1).(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.toplevel$package.combine(+1).(y)*/ +/*=>>scala.Int#`+`(+4).*/ z/*=>>_empty_.toplevel$package.combine(+1).(z)*/
-def combine/*<<=_empty_.toplevel$package.combine(+2).*/ = 0
-def foo/*<<=_empty_.toplevel$package.foo().*/ = "foo"
+inline val a = "/*<<=_empty_.package.*//*<<=_empty_.package.a.*/"
+def (x: Int/*<<=_empty_.package.combine().*//*<<=_empty_.package.combine().(x)*//*=>>scala.Int#*/) combine (y/*<<=_empty_.package.combine().(y)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.package.combine().(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.package.combine().(y)*/
+def combine/*<<=_empty_.package.combine(+1).*/(x/*<<=_empty_.package.combine(+1).(x)*/: Int/*=>>scala.Int#*/, y/*<<=_empty_.package.combine(+1).(y)*/: Int/*=>>scala.Int#*/, z/*<<=_empty_.package.combine(+1).(z)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.package.combine(+1).(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.package.combine(+1).(y)*/ +/*=>>scala.Int#`+`(+4).*/ z/*=>>_empty_.package.combine(+1).(z)*/
+def combine/*<<=_empty_.package.combine(+2).*/ = 0
+def foo/*<<=_empty_.package.foo().*/ = "foo"