do not append package objects to symbols

Author: bishabosha

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

@@ -66,7 +66,7 @@ class ExtractSemanticDB extends Phase {
         isJavaIdentifierStart(str.head) && str.tail.forall(isJavaIdentifierPart)
 
       def addName(name: Name) =
-        val str = name.toString
+        val str = name.toString.replaceAllLiterally("package","<???>")
         if isJavaIdent(str) then b.append(str)
         else b.append('`').append(str).append('`')
 
@@ -93,6 +93,8 @@ class ExtractSemanticDB extends Phase {
           b.append('['); addName(sym.name); b.append(']')
         else if sym.is(Param) then
           b.append('('); addName(sym.name); b.append(')')
+        else if sym.isPackageObject then
+          ()
         else
           addName(sym.name)
           if sym.is(Package) then b.append('/')

tests/semanticdb/Advanced.expect.scala

@@ -16,7 +16,7 @@ class Structural/*<<=advanced.Structural#*/ {
 }
 
 class Wildcards/*<<=advanced.Wildcards#*/ {
-  def e1/*<<=advanced.Wildcards#e1().*/: List/*=>>scala.package.List#*/[_] = ???/*=>>scala.Predef.`???`().*/
+  def e1/*<<=advanced.Wildcards#e1().*/: List/*=>>scala.List#*/[_] = ???/*=>>scala.Predef.`???`().*/
 }
 
 object Test/*<<=advanced.Test.*/ {
@@ -34,7 +34,7 @@ object Test/*<<=advanced.Test.*/ {
 
   {
     (???/*=>>scala.Predef.`???`().*/ : Any/*=>>scala.Any#*/) match {
-      case e3/*<<=local7*/: List/*=>>scala.package.List#*/[_] =>
+      case e3/*<<=local7*/: List/*=>>scala.List#*/[_] =>
         val e3x/*<<=local8*/ = e3/*=>>local7*/.head/*=>>scala.collection.IterableOps#head().*/
         ()
     }

tests/semanticdb/Anonymous.expect.scala

@@ -7,9 +7,9 @@ class Anonymous/*<<=example.Anonymous#*/ {
   def locally/*<<=example.Anonymous#locally().*/[A/*<<=example.Anonymous#locally().[A]*/](x/*<<=example.Anonymous#locally().(x)*/: A/*=>>example.Anonymous#locally().[A]*/): A/*=>>example.Anonymous#locally().[A]*/ = x/*=>>example.Anonymous#locally().(x)*/
 
   def m1/*<<=example.Anonymous#m1().*/[T/*<<=example.Anonymous#m1().[T]*/[_]] = ???/*=>>scala.Predef.`???`().*/
-  def m2/*<<=example.Anonymous#m2().*/: Map/*=>>scala.Predef.Map#*/[_, List/*=>>scala.package.List#*/[_]] = ???/*=>>scala.Predef.`???`().*/
+  def m2/*<<=example.Anonymous#m2().*/: Map/*=>>scala.Predef.Map#*/[_, List/*=>>scala.List#*/[_]] = ???/*=>>scala.Predef.`???`().*/
   locally/*=>>example.Anonymous#locally().*/ {
-    ???/*=>>scala.Predef.`???`().*/ match { case _: List/*=>>scala.package.List#*/[_] => }
+    ???/*=>>scala.Predef.`???`().*/ match { case _: List/*=>>scala.List#*/[_] => }
   }
   locally/*=>>example.Anonymous#locally().*/ {
     val x/*<<=local0*/: Int/*=>>scala.Int#*/ => Int/*=>>scala.Int#*/ = _ => ???/*=>>scala.Predef.`???`().*/

tests/semanticdb/Classes.expect.scala

@@ -26,7 +26,7 @@ object N/*<<=classes.N.*/ {
   val anonClass/*<<=classes.N.anonClass.*/ = new C7/*=>>classes.C7#*//*=>>classes.C7#`<init>`().*/(42) {
     val local/*<<=local0*/ = ???/*=>>scala.Predef.`???`().*/
   }
-  val anonFun/*<<=classes.N.anonFun.*/ = List/*=>>scala.package.List().*//*=>>scala.collection.IterableFactory#apply().*/(1).map/*=>>scala.collection.immutable.List#map().*/ { i =>
+  val anonFun/*<<=classes.N.anonFun.*/ = List/*=>>scala.List().*//*=>>scala.collection.IterableFactory#apply().*/(1).map/*=>>scala.collection.immutable.List#map().*/ { i =>
     val local = 2
     local/*=>>local1*/ +/*=>>scala.Int#`+`(+4).*/ 2
   }

tests/semanticdb/EmptyObject.expect.scala

@@ -0,0 +1,3 @@
+package example
+
+object EmptyObject/*<<=example.EmptyObject.*/ {}

tests/semanticdb/EmptyObject.scala

@@ -0,0 +1,3 @@
+package example
+
+object EmptyObject {}

tests/semanticdb/EtaExpansion.expect.scala

@@ -0,0 +1,6 @@
+package example
+
+class EtaExpansion/*<<=example.EtaExpansion#*/ {
+  Some/*=>>scala.Some.*/(1).map/*=>>scala.Option#map().*/(identity/*=>>scala.Predef.identity().*/)
+  List/*=>>scala.List().*//*=>>scala.collection.IterableFactory#apply().*/(1).foldLeft/*=>>scala.collection.LinearSeqOps#foldLeft().*/("")(_ +/*=>>java.lang.String#`+`().*/ _)
+}

tests/semanticdb/EtaExpansion.scala

@@ -0,0 +1,6 @@
+package example
+
+class EtaExpansion {
+  Some(1).map(identity)
+  List(1).foldLeft("")(_ + _)
+}

tests/semanticdb/semanticdb-extract.expect.scala

@@ -9,9 +9,9 @@ object AnObject/*<<=_empty_.AnObject.*/ {
   "".substring/*=>>java.lang.String#substring().*/(1)
   "".substring/*=>>java.lang.String#substring(+1).*/(1, 2)
 
-  List/*=>>scala.package.List().*//*=>>scala.collection.IterableFactory#apply().*/(1, 2)
-  List/*=>>scala.package.List().*/.apply/*=>>scala.collection.IterableFactory#apply().*/()
-  List/*=>>scala.package.List().*/.`apply`/*=>>scala.collection.IterableFactory#apply().*/()
+  List/*=>>scala.List().*//*=>>scala.collection.IterableFactory#apply().*/(1, 2)
+  List/*=>>scala.List().*/.apply/*=>>scala.collection.IterableFactory#apply().*/()
+  List/*=>>scala.List().*/.`apply`/*=>>scala.collection.IterableFactory#apply().*/()
   println/*=>>scala.Predef.println(+1).*/(1 +/*=>>scala.Int#`+`(+4).*/ 2)
 
   case class Foo/*<<=_empty_.AnObject.Foo#*/(x/*<<=_empty_.AnObject.Foo#x.*/: Int/*=>>scala.Int#*/)

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_.*//*<<=_empty_.a.*/"
+def (x: Int/*<<=_empty_.combine().*//*<<=_empty_.combine().(x)*//*=>>scala.Int#*/) combine (y/*<<=_empty_.combine().(y)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.combine().(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.combine().(y)*/
+def combine/*<<=_empty_.combine(+1).*/(x/*<<=_empty_.combine(+1).(x)*/: Int/*=>>scala.Int#*/, y/*<<=_empty_.combine(+1).(y)*/: Int/*=>>scala.Int#*/, z/*<<=_empty_.combine(+1).(z)*/: Int/*=>>scala.Int#*/) = x/*=>>_empty_.combine(+1).(x)*/ +/*=>>scala.Int#`+`(+4).*/ y/*=>>_empty_.combine(+1).(y)*/ +/*=>>scala.Int#`+`(+4).*/ z/*=>>_empty_.combine(+1).(z)*/
+def combine/*<<=_empty_.combine(+2).*/ = 0
+def foo/*<<=_empty_.foo().*/ = "foo"