define anon classes

Author: bishabosha

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

@@ -72,7 +72,7 @@ class ExtractSemanticDB extends Phase with
       !sym.exists
       || sym.isLocalDummy
       || sym.is(Synthetic)
-      || sym.isConstructor && sym.owner.is(ModuleClass)
+      || sym.isConstructor && (sym.owner.is(ModuleClass) || !sym.isGlobal)
       || excludeDefStrict(sym)
 
     private def excludeDefStrict(sym: Symbol)(given Context): Boolean =
@@ -81,7 +81,8 @@ class ExtractSemanticDB extends Phase with
 
     private def excludeSymbolStrict(sym: Symbol)(given Context): Boolean =
       sym.name.isWildcard
-      || sym.isAnonymous
+      || sym.isAnonymousFunction
+      || sym.isAnonymousModuleVal
       || sym.name.isEmptyNumbered
 
     private def excludeChildren(sym: Symbol)(given Context): Boolean =
@@ -124,7 +125,7 @@ class ExtractSemanticDB extends Phase with
             return
           if !excludeDef(tree.symbol)
           && tree.span.hasLength
-            registerDefinition(tree.symbol, tree.nameSpan, symbolKinds(tree))
+            registerDefinition(tree.symbol, tree.adjustedNameSpan, symbolKinds(tree))
             val privateWithin = tree.symbol.privateWithin
             if privateWithin.exists
               registerUse(privateWithin, spanOfSymbol(privateWithin, tree.span))
@@ -213,6 +214,12 @@ class ExtractSemanticDB extends Phase with
         case _ =>
           traverseChildren(tree)
 
+    private def (tree: NamedDefTree) adjustedNameSpan(given Context): Span =
+      if tree.span.exists && tree.name.isAnonymousFunctionName || tree.name.isAnonymousClassName
+        Span(tree.span.point)
+      else
+        tree.nameSpan
+
     /** Add semanticdb name of the given symbol to string builder */
     private def addSymName(b: StringBuilder, sym: Symbol)(given ctx: Context): Unit =
 

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

@@ -202,4 +202,8 @@ object Scala3 with
 
   end InfoOps
 
+  given RangeOps: (range: Range) with
+    def hasLength = range.endLine > range.startLine || range.endCharacter > range.startCharacter
+  end RangeOps
+
 end Scala3

tests/semanticdb/expect/Advanced.expect.scala

@@ -11,8 +11,8 @@ class C/*<-advanced::C#*/[T/*<-advanced::C#[T]*/] {
 
 class Structural/*<-advanced::Structural#*/ {
   def s1/*<-advanced::Structural#s1().*/: { val x/*<-local0*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
-  def s2/*<-advanced::Structural#s2().*/: { val x/*<-local1*/: Int/*->scala::Int#*/ } = new { val x/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
-  def s3/*<-advanced::Structural#s3().*/: { def m/*<-local4*/(x/*<-local5*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ } = new { def m/*<-local7*/(x/*<-local8*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+  def s2/*<-advanced::Structural#s2().*/: { val x/*<-local1*/: Int/*->scala::Int#*/ } = /*<-local2*/new { val x/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+  def s3/*<-advanced::Structural#s3().*/: { def m/*<-local4*/(x/*<-local5*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ } = /*<-local6*/new { def m/*<-local7*/(x/*<-local8*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
 }
 
 class Wildcards/*<-advanced::Wildcards#*/ {

tests/semanticdb/expect/Anonymous.expect.scala

@@ -16,5 +16,5 @@ class Anonymous/*<-example::Anonymous#*/ {
   }
 
   trait Foo/*<-example::Anonymous#Foo#*/
-  val foo/*<-example::Anonymous#foo.*/ = new Foo/*->example::Anonymous#Foo#*/ {}
+  val foo/*<-example::Anonymous#foo.*/ = /*<-local1*/new Foo/*->example::Anonymous#Foo#*/ {}
 }

tests/semanticdb/expect/Classes.expect.scala

@@ -23,7 +23,7 @@ class C8/*<-classes::C8#*/(private[this] val x/*<-classes::C8#x.*/: Int/*->scala
 class C9/*<-classes::C9#*/(private[this] var x/*<-classes::C9#x().*/: Int/*->scala::Int#*/)
 
 object N/*<-classes::N.*/ {
-  val anonClass/*<-classes::N.anonClass.*/ = new C7/*->classes::C7#*/(42) {
+  val anonClass/*<-classes::N.anonClass.*/ = /*<-local0*/new C7/*->classes::C7#*/(42) {
     val local/*<-local1*/ = ???/*->scala::Predef.`???`().*/
   }
   val anonFun/*<-classes::N.anonFun.*/ = List/*->scala::package.List.*//*->scala::collection::IterableFactory#apply().*/(1).map/*->scala::collection::immutable::List#map().*/ { i/*<-local2*/ =>

tests/semanticdb/expect/Traits.expect.scala

@@ -6,7 +6,7 @@ trait T/*<-traits::T#*/ {
 
 sealed trait U/*<-traits::U#*/
 object U/*<-traits::U.*/ {
-  def u/*<-traits::U.u().*/: U/*->traits::U#*/ = new U/*->traits::U#*/ {}
+  def u/*<-traits::U.u().*/: U/*->traits::U#*/ = /*<-local0*/new U/*->traits::U#*/ {}
 }
 
 class C/*<-traits::C#*/

tests/semanticdb/expect/Types.expect.scala

@@ -55,9 +55,9 @@ object Test/*<-types::Test.*/ {
     val compoundType1/*<-types::Test.C#compoundType1.*/: { def k/*<-local0*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
     val compoundType2/*<-types::Test.C#compoundType2.*/: M/*->types::Test.M#*/ with N/*->types::Test.N#*/ = ???/*->scala::Predef.`???`().*/
     val compoundType3/*<-types::Test.C#compoundType3.*/: M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local1*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
-    val compoundType4/*<-types::Test.C#compoundType4.*/ = new { def k/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
-    val compoundType5/*<-types::Test.C#compoundType5.*/ = new M/*->types::Test.M#*/ with N/*->types::Test.N#*/
-    val compoundType6/*<-types::Test.C#compoundType6.*/ = new M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local6*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+    val compoundType4/*<-types::Test.C#compoundType4.*/ = /*<-local2*/new { def k/*<-local3*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
+    val compoundType5/*<-types::Test.C#compoundType5.*/ = /*<-local4*/new M/*->types::Test.M#*/ with N/*->types::Test.N#*/
+    val compoundType6/*<-types::Test.C#compoundType6.*/ = /*<-local5*/new M/*->types::Test.M#*/ with N/*->types::Test.N#*/ { def k/*<-local6*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
 
     val annType1/*<-types::Test.C#annType1.*/: T/*->types::T#*/ @ann(42) = ???/*->scala::Predef.`???`().*/
     val annType2/*<-types::Test.C#annType2.*/: T/*->types::T#*/ @ann1 @ann2 = ???/*->scala::Predef.`???`().*/

tests/semanticdb/metac.expect

@@ -50,7 +50,7 @@ Uri => Advanced.scala
 Text => empty
 Language => Scala
 Symbols => 34 entries
-Occurrences => 96 entries
+Occurrences => 94 entries
 
 Symbols:
 advanced/C# => class C
@@ -78,11 +78,11 @@ advanced/Wildcards#`<init>`(). => primary ctor <init>
 advanced/Wildcards#e1(). => method e1
 local0 => abstract val method x
 local1 => abstract val method x
-local2 => primary ctor <init>
+local2 => final class $anon
 local3 => val method x
 local4 => abstract method m
 local5 => param x
-local6 => primary ctor <init>
+local6 => final class $anon
 local7 => method m
 local8 => param x
 local9 => val local e3
@@ -115,23 +115,21 @@ Occurrences:
 [13:6..13:8): s2 <- advanced/Structural#s2().
 [13:16..13:17): x <- local1
 [13:19..13:22): Int -> scala/Int#
-[13:33..13:33): <- local2
+[13:27..13:27): <- local2
 [13:37..13:38): x <- local3
 [13:40..13:43): Int -> scala/Int#
 [13:46..13:49): ??? -> scala/Predef.`???`().
-[13:51..13:51): -> local2
 [14:6..14:8): s3 <- advanced/Structural#s3().
 [14:16..14:17): m <- local4
 [14:18..14:19): x <- local5
 [14:21..14:24): Int -> scala/Int#
 [14:27..14:30): Int -> scala/Int#
-[14:41..14:41): <- local6
+[14:35..14:35): <- local6
 [14:45..14:46): m <- local7
 [14:47..14:48): x <- local8
 [14:50..14:53): Int -> scala/Int#
 [14:56..14:59): Int -> scala/Int#
 [14:62..14:65): ??? -> scala/Predef.`???`().
-[14:67..14:67): -> local6
 [17:6..17:15): Wildcards <- advanced/Wildcards#
 [18:2..18:2): <- advanced/Wildcards#`<init>`().
 [18:6..18:8): e1 <- advanced/Wildcards#e1().
@@ -283,7 +281,7 @@ Uri => Anonymous.scala
 Text => empty
 Language => Scala
 Symbols => 13 entries
-Occurrences => 34 entries
+Occurrences => 33 entries
 
 Symbols:
 example/Anonymous# => class Anonymous
@@ -298,7 +296,7 @@ example/Anonymous#m1(). => method m1
 example/Anonymous#m1().[T] => typeparam T
 example/Anonymous#m2(). => method m2
 local0 => val local x
-local1 => primary ctor <init>
+local1 => final class $anon
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -332,9 +330,8 @@ Occurrences:
 [17:2..17:2): <- example/Anonymous#Foo#`<init>`().
 [17:8..17:11): Foo <- example/Anonymous#Foo#
 [18:6..18:9): foo <- example/Anonymous#foo.
-[18:16..18:16): <- local1
+[18:12..18:12): <- local1
 [18:16..18:19): Foo -> example/Anonymous#Foo#
-[18:22..18:22): -> local1
 
 expect/Classes.scala
 ____________________
@@ -345,7 +342,7 @@ Uri => Classes.scala
 Text => empty
 Language => Scala
 Symbols => 75 entries
-Occurrences => 60 entries
+Occurrences => 59 entries
 
 Symbols:
 classes/C1# => final class C1
@@ -419,7 +416,7 @@ classes/M.C5().(x) => param x
 classes/N. => final object N
 classes/N.anonClass. => val method anonClass
 classes/N.anonFun. => val method anonFun
-local0 => primary ctor <init>
+local0 => final class $anon
 local1 => val method local
 local2 => param i
 local3 => val local local
@@ -471,12 +468,11 @@ Occurrences:
 [22:30..22:33): Int -> scala/Int#
 [24:7..24:8): N <- classes/N.
 [25:6..25:15): anonClass <- classes/N.anonClass.
-[25:22..25:22): <- local0
+[25:18..25:18): <- local0
 [25:22..25:24): C7 -> classes/C7#
 [25:24..25:24): -> classes/C7#`<init>`().
 [26:8..26:13): local <- local1
 [26:16..26:19): ??? -> scala/Predef.`???`().
-[27:3..27:3): -> local0
 [28:6..28:13): anonFun <- classes/N.anonFun.
 [28:16..28:20): List -> scala/package.List.
 [28:20..28:20): -> scala/collection/IterableFactory#apply().
@@ -2641,10 +2637,10 @@ Uri => Traits.scala
 Text => empty
 Language => Scala
 Symbols => 13 entries
-Occurrences => 18 entries
+Occurrences => 17 entries
 
 Symbols:
-local0 => primary ctor <init>
+local0 => final class $anon
 local1 => selfparam self
 traits/C# => class C
 traits/C#`<init>`(). => primary ctor <init>
@@ -2668,9 +2664,8 @@ Occurrences:
 [7:7..7:8): U <- traits/U.
 [8:6..8:7): u <- traits/U.u().
 [8:9..8:10): U -> traits/U#
-[8:17..8:17): <- local0
+[8:13..8:13): <- local0
 [8:17..8:18): U -> traits/U#
-[8:21..8:21): -> local0
 [11:0..11:0): <- traits/C#`<init>`().
 [11:6..11:7): C <- traits/C#
 [12:6..12:7): V <- traits/V#
@@ -2687,15 +2682,15 @@ Uri => Types.scala
 Text => empty
 Language => Scala
 Symbols => 125 entries
-Occurrences => 249 entries
+Occurrences => 246 entries
 
 Symbols:
 local0 => abstract method k
 local1 => abstract method k
-local2 => primary ctor <init>
+local2 => final class $anon
 local3 => method k
-local4 => primary ctor <init>
-local5 => primary ctor <init>
+local4 => final class $anon
+local5 => final class $anon
 local6 => method k
 local7 => type L
 local8 => typeparam T
@@ -2939,26 +2934,23 @@ Occurrences:
 [56:41..56:44): Int -> scala/Int#
 [56:49..56:52): ??? -> scala/Predef.`???`().
 [57:8..57:21): compoundType4 <- types/Test.C#compoundType4.
-[57:30..57:30): <- local2
+[57:24..57:24): <- local2
 [57:34..57:35): k <- local3
 [57:37..57:40): Int -> scala/Int#
 [57:43..57:46): ??? -> scala/Predef.`???`().
-[57:48..57:48): -> local2
 [58:8..58:21): compoundType5 <- types/Test.C#compoundType5.
-[58:28..58:28): <- local4
+[58:24..58:24): <- local4
 [58:28..58:29): M -> types/Test.M#
 [58:29..58:29): -> types/Test.M#`<init>`().
 [58:35..58:36): N -> types/Test.N#
-[58:36..58:36): -> local4
 [59:8..59:21): compoundType6 <- types/Test.C#compoundType6.
-[59:28..59:28): <- local5
+[59:24..59:24): <- local5
 [59:28..59:29): M -> types/Test.M#
 [59:29..59:29): -> types/Test.M#`<init>`().
 [59:35..59:36): N -> types/Test.N#
 [59:43..59:44): k <- local6
 [59:46..59:49): Int -> scala/Int#
 [59:52..59:55): ??? -> scala/Predef.`???`().
-[59:57..59:57): -> local5
 [61:8..61:16): annType1 <- types/Test.C#annType1.
 [61:18..61:19): T -> types/T#
 [61:31..61:34): ??? -> scala/Predef.`???`().