Make wildcard type symbol global

Author: tanishiking

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

@@ -35,7 +35,7 @@ object Scala3:
     * - name: local...
     * - SymbolInformation with signature TypeSignature of given type bound.
     */
-  case class WildcardTypeSymbol(bounds: TypeBounds) extends FakeSymbol
+  case class WildcardTypeSymbol(owner: Symbol, bounds: TypeBounds) extends FakeSymbol
   case class TypeParamRefSymbol(owner: Symbol, name: Name, tp: TypeBounds) extends FakeSymbol
   type SemanticSymbol = Symbol | FakeSymbol
   extension (sym: SemanticSymbol)

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

@@ -31,10 +31,11 @@ class SemanticSymbolBuilder:
     b.toString
   def symbolName(sym: FakeSymbol)(using Context): String =
     sym match
-      case _: WildcardTypeSymbol =>
-        val idx = nextLocalIdx
-        nextLocalIdx += 1
-        s"${Symbols.LocalPrefix}${idx}"
+      case sym: WildcardTypeSymbol =>
+        val b = StringBuilder(20)
+        addSymName(b, sym.owner)
+        b.append('['); addName(b, sym.name); b.append(']')
+        b.toString
       case sym: TypeParamRefSymbol =>
         val b = StringBuilder(20)
         addSymName(b, sym.owner)

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

@@ -183,7 +183,7 @@ class TypeOps:
               val paramSyms: List[SemanticSymbol] = lambda.paramNames.zip(lambda.paramInfos).flatMap { (paramName, bounds) =>
                 // def x[T[_]] = ???
                 if paramName.isWildcard then
-                  Some(WildcardTypeSymbol(bounds))
+                  Some(WildcardTypeSymbol(sym, bounds))
                 else
                   val found = paramRefSymtab.lookup(lambda, paramName, sym)
                   if found.exists then
@@ -343,7 +343,7 @@ class TypeOps:
               // display_name: "_" and,
               // signature: type_signature(..., lo = <Nothing>, hi = <T>)
               case bounds: TypeBounds =>
-                val wildcardSym = WildcardTypeSymbol(bounds)
+                val wildcardSym = WildcardTypeSymbol(sym, bounds)
                 val ssym = wildcardSym.symbolName
                 (Some(wildcardSym), s.TypeRef(s.Type.Empty, ssym, Seq.empty))
               case other =>

tests/semanticdb/expect/Advanced.expect.scala

@@ -36,8 +36,8 @@ object Test/*<-advanced::Test.*/ {
 
   {
     (???/*->scala::Predef.`???`().*/ : Any/*->scala::Any#*/) match {
-      case e3/*<-local15*/: List/*->scala::package.List#*/[_] =>
-        val e3x/*<-local17*/ = e3/*->local15*/.head/*->scala::collection::IterableOps#head().*/
+      case e3/*<-local12*/: List/*->scala::package.List#*/[_] =>
+        val e3x/*<-local14*/ = e3/*->local12*/.head/*->scala::collection::IterableOps#head().*/
         ()
     }
   }

tests/semanticdb/expect/Anonymous.expect.scala

@@ -12,7 +12,7 @@ class Anonymous/*<-example::Anonymous#*/ {
     ???/*->scala::Predef.`???`().*/ match { case _: List/*->scala::package.List#*/[_] => }
   }
   locally/*->example::Anonymous#locally().*/ {
-    val x/*<-local3*/: Int/*->scala::Int#*/ => Int/*->scala::Int#*/ = _ => ???/*->scala::Predef.`???`().*/
+    val x/*<-local0*/: Int/*->scala::Int#*/ => Int/*->scala::Int#*/ = _ => ???/*->scala::Predef.`???`().*/
   }
 
   trait Foo/*<-example::Anonymous#Foo#*/

tests/semanticdb/expect/Enums.expect.scala

@@ -50,7 +50,7 @@ object Enums/*<-_empty_::Enums.*/:
     given /*<-_empty_::Enums.`<:<`.`given_<:<_T_T`().*/[T/*<-_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/]: (T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.`given_<:<_T_T`().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.apply().*/()
 
   extension [A/*<-_empty_::Enums.unwrap().[A]*/, B/*<-_empty_::Enums.unwrap().[B]*/](opt/*<-_empty_::Enums.unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.unwrap().[A]*/]) def unwrap/*<-_empty_::Enums.unwrap().*/(using ev/*<-_empty_::Enums.unwrap().(ev)*/: A/*->_empty_::Enums.unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/] = ev/*->_empty_::Enums.unwrap().(ev)*/ match
-    case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local7*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])
+    case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local0*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])
 
   val some1/*<-_empty_::Enums.some1.*/ = Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1)).unwrap/*->_empty_::Enums.unwrap().*//*->_empty_::Enums.`<:<`.`given_<:<_T_T`().*/
 

tests/semanticdb/expect/semanticdb-Types.expect.scala

@@ -74,7 +74,7 @@ object Test/*<-types::Test.*/ {
     val existentialType4/*<-types::Test.C#existentialType4.*/ = Class/*->java::lang::Class#*/.forName/*->java::lang::Class#forName().*/("foo.Bar")
 
     def typeLambda1/*<-types::Test.C#typeLambda1().*/[M/*<-types::Test.C#typeLambda1().[M]*/[_]] = ???/*->scala::Predef.`???`().*/
-    typeLambda1/*->types::Test.C#typeLambda1().*/[({ type L/*<-local15*/[T/*<-local14*/] = List/*->scala::package.List#*/[T/*->local14*/] })#L]
+    typeLambda1/*->types::Test.C#typeLambda1().*/[({ type L/*<-local11*/[T/*<-local10*/] = List/*->scala::package.List#*/[T/*->local10*/] })#L]
 
     object ClassInfoType1/*<-types::Test.C#ClassInfoType1.*/
     class ClassInfoType2/*<-types::Test.C#ClassInfoType2#*/ extends B/*->types::B#*/ { def x/*<-types::Test.C#ClassInfoType2#x().*/ = 42 }

tests/semanticdb/metac.expect

@@ -96,8 +96,8 @@ local7 => param x: Int
 local8 => method m (param x: Int): Int
 local9 => final class $anon extends Object { self: $anon => +2 decls }
 local11 => abstract val method x Int
-local15 => val local e3: List[local16]
-local17 => val local e3x: local16
+local12 => val local e3: List[local13]
+local14 => val local e3x: local13
 
 Occurrences:
 [0:8..0:16): advanced <- advanced/
@@ -195,10 +195,10 @@ Occurrences:
 [34:17..34:21): head -> scala/collection/IterableOps#head().
 [37:5..37:8): ??? -> scala/Predef.`???`().
 [37:11..37:14): Any -> scala/Any#
-[38:11..38:13): e3 <- local15
+[38:11..38:13): e3 <- local12
 [38:15..38:19): List -> scala/package.List#
-[39:12..39:15): e3x <- local17
-[39:18..39:20): e3 -> local15
+[39:12..39:15): e3x <- local14
+[39:18..39:20): e3 -> local12
 [39:21..39:25): head -> scala/collection/IterableOps#head().
 [47:6..47:13): HKClass <- advanced/HKClass#
 [47:13..47:13): <- advanced/HKClass#`<init>`().
@@ -323,11 +323,11 @@ example/Anonymous#foo. => val method foo Foo
 example/Anonymous#locally(). => method locally [typeparam A ](param x: A): A
 example/Anonymous#locally().(x) => param x: A
 example/Anonymous#locally().[A] => typeparam A 
-example/Anonymous#m1(). => method m1 [typeparam T [unknown local0: <?>]]: Nothing
-example/Anonymous#m1().[T] => typeparam T [unknown local0: <?>]
+example/Anonymous#m1(). => method m1 [typeparam T [unknown _: <?>]]: Nothing
+example/Anonymous#m1().[T] => typeparam T [unknown _: <?>]
 example/Anonymous#m2(). => method m2 => Map[_, List[_] forSome { type _  }] forSome { type _  }
-local3 => val local x: Function1[Int, Int]
-local4 => final class $anon extends Object with Foo { self: $anon => +1 decls }
+local0 => val local x: Function1[Int, Int]
+local1 => final class $anon extends Object with Foo { self: $anon => +1 decls }
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -354,7 +354,7 @@ Occurrences:
 [11:4..11:7): ??? -> scala/Predef.`???`().
 [11:24..11:28): List -> scala/package.List#
 [13:2..13:9): locally -> example/Anonymous#locally().
-[14:8..14:9): x <- local3
+[14:8..14:9): x <- local0
 [14:11..14:14): Int -> scala/Int#
 [14:18..14:21): Int -> scala/Int#
 [14:29..14:32): ??? -> scala/Predef.`???`().
@@ -1038,7 +1038,7 @@ _empty_/Enums.unwrap().(ev) => implicit param ev: <:<[A, Option[B]]
 _empty_/Enums.unwrap().(opt) => param opt: Option[A]
 _empty_/Enums.unwrap().[A] => typeparam A 
 _empty_/Enums.unwrap().[B] => typeparam B 
-local7 => param x: Option[B]
+local0 => param x: Option[B]
 
 Occurrences:
 [0:7..0:12): Enums <- _empty_/Enums.
@@ -1167,7 +1167,7 @@ Occurrences:
 [52:19..52:22): opt -> _empty_/Enums.unwrap().(opt)
 [52:23..52:30): flatMap -> scala/Option#flatMap().
 [52:31..52:39): identity -> scala/Predef.identity().
-[52:31..52:31): -> local7
+[52:31..52:31): -> local0
 [52:40..52:46): Option -> scala/Option#
 [52:47..52:48): B -> _empty_/Enums.unwrap().[B]
 [54:6..54:11): some1 <- _empty_/Enums.some1.
@@ -1325,9 +1325,9 @@ ext/Extension$package.readInto(). => method readInto [typeparam T ](param s: Str
 ext/Extension$package.readInto().(s) => param s: String
 ext/Extension$package.readInto().(x$2) => implicit param x$2: Read[T]
 ext/Extension$package.readInto().[T] => typeparam T 
-ext/Functor# => trait Functor [typeparam F [unknown local0: <?>]] extends Object { self: Functor[F] => +3 decls }
-ext/Functor#[F] => typeparam F [unknown local0: <?>]
-ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [unknown local0: <?>]](): Functor[F]
+ext/Functor# => trait Functor [typeparam F [unknown _: <?>]] extends Object { self: Functor[F] => +3 decls }
+ext/Functor#[F] => typeparam F [unknown _: <?>]
+ext/Functor#`<init>`(). => primary ctor <init> [typeparam F [unknown _: <?>]](): Functor[F]
 ext/Functor#map(). => abstract method map [typeparam T , typeparam U ](param t: F[T])(param f: Function1[T, U]): F[U]
 ext/Functor#map().(f) => param f: Function1[T, U]
 ext/Functor#map().(t) => param t: F[T]
@@ -4381,8 +4381,8 @@ local3 => final class $anon extends Object { self: $anon => +2 decls }
 local5 => final class $anon extends M with N { self: $anon => +1 decls }
 local7 => method k => Int
 local8 => final class $anon extends M with N { self: $anon => +2 decls }
-local14 => typeparam T 
-local15 => type L [typeparam T ] = List[T]
+local10 => typeparam T 
+local11 => type L [typeparam T ] = List[T]
 types/B# => class B extends Object { self: B => +1 decls }
 types/B#`<init>`(). => primary ctor <init> (): B
 types/C# => class C extends Object { self: C => +1 decls }
@@ -4460,8 +4460,8 @@ types/Test.C#TypeType.T5# => type T5 [typeparam U ] = U
 types/Test.C#TypeType.T5#[U] => typeparam U 
 types/Test.C#TypeType.m2(). => method m2 [typeparam T2  = C]: Nothing
 types/Test.C#TypeType.m2().[T2] => typeparam T2  = C
-types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [unknown local16: <?>]]: Nothing
-types/Test.C#TypeType.m3().[M3] => typeparam M3 [unknown local16: <?>]
+types/Test.C#TypeType.m3(). => method m3 [typeparam M3 [unknown _: <?>]]: Nothing
+types/Test.C#TypeType.m3().[M3] => typeparam M3 [unknown _: <?>]
 types/Test.C#`<init>`(). => primary ctor <init> (): C
 types/Test.C#annType1. => val method annType1 T @ann[T]
 types/Test.C#annType2. => val method annType2 T @ann1 @ann2
@@ -4482,8 +4482,8 @@ types/Test.C#superType2. => val method superType2 Int
 types/Test.C#superType3. => val method superType3 Int
 types/Test.C#thisType1. => val method thisType1 C.this.type
 types/Test.C#thisType2. => val method thisType2 C.this.type
-types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [unknown local13: <?>]]: Nothing
-types/Test.C#typeLambda1().[M] => typeparam M [unknown local13: <?>]
+types/Test.C#typeLambda1(). => method typeLambda1 [typeparam M [unknown _: <?>]]: Nothing
+types/Test.C#typeLambda1().[M] => typeparam M [unknown _: <?>]
 types/Test.C#typeRef1. => val method typeRef1 C
 types/Test.C#typeRef2. => val method typeRef2 p.C
 types/Test.C#typeRef3. => val method typeRef3 T#C
@@ -4680,10 +4680,10 @@ Occurrences:
 [75:20..75:21): M <- types/Test.C#typeLambda1().[M]
 [75:28..75:31): ??? -> scala/Predef.`???`().
 [76:4..76:15): typeLambda1 -> types/Test.C#typeLambda1().
-[76:24..76:25): L <- local15
-[76:26..76:27): T <- local14
+[76:24..76:25): L <- local11
+[76:26..76:27): T <- local10
 [76:31..76:35): List -> scala/package.List#
-[76:36..76:37): T -> local14
+[76:36..76:37): T -> local10
 [78:11..78:25): ClassInfoType1 <- types/Test.C#ClassInfoType1.
 [79:10..79:24): ClassInfoType2 <- types/Test.C#ClassInfoType2#
 [79:33..79:34): B -> types/B#