synthethic span gets zero length nameSpan

Also, proxy wrappers for main annotated methods get a synthetic span

Author: bishabosha

compiler/src/dotty/tools/dotc/ast/MainProxies.scala

@@ -99,8 +99,8 @@ object MainProxies {
       val mainTempl = Template(emptyConstructor, Nil, Nil, EmptyValDef, mainMeth :: Nil)
       val mainCls = TypeDef(mainFun.name.toTypeName, mainTempl)
         .withFlags(Final)
-      if (!ctx.reporter.hasErrors) result = mainCls.withSpan(mainAnnotSpan) :: Nil
+      if (!ctx.reporter.hasErrors) result = mainCls.withSpan(mainAnnotSpan.toSynthetic) :: Nil
     }
     result
   }
-}
+}

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -340,7 +340,7 @@ object Trees {
     def nameSpan: Span =
       if (span.exists) {
         val point = span.point
-        if (rawMods.is(Synthetic) || name.toTermName == nme.ERROR) Span(point)
+        if (rawMods.is(Synthetic) || span.isSynthetic || name.toTermName == nme.ERROR) Span(point)
         else {
           val realName = name.stripModuleClassSuffix.lastPart
           Span(point, point + realName.length, point)

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

@@ -184,7 +184,7 @@ class ExtractSemanticDB extends Phase:
           val ctorSym = tree.constr.symbol
           if !excludeDef(ctorSym) then
             traverseAnnotsOfDefinition(ctorSym)
-            registerDefinition(ctorSym, Span(tree.constr.nameSpan.point), Set.empty, tree.source)
+            registerDefinition(ctorSym, tree.constr.nameSpan.startPos, Set.empty, tree.source)
             ctorParams(tree.constr.vparamss, tree.body)
           for parent <- tree.parentsOrDerived if parent.span.hasLength do
             traverse(parent)
@@ -285,11 +285,11 @@ class ExtractSemanticDB extends Phase:
 
     extension (tree: NamedDefTree):
       private def adjustedNameSpan(using Context): Span =
-        val span = tree.nameSpan
+        val nameSpan = tree.nameSpan
         if tree.symbol.is(ExtensionMethod) && tree.name.isExtensionName then
-          span.withEnd(span.end - ExtractSemanticDB.extensionPrefixLength)
+          nameSpan.withEnd(nameSpan.end - ExtractSemanticDB.extensionPrefixLength)
         else
-          span
+          nameSpan
 
     /** Add semanticdb name of the given symbol to string builder */
     private def addSymName(b: StringBuilder, sym: Symbol)(using Context): Unit =
@@ -531,8 +531,7 @@ class ExtractSemanticDB extends Phase:
       Span(start max limit, end)
 
     extension (span: Span):
-      private def hasLength: Boolean = span.start != span.end
-      private def zeroLength: Boolean = span.start == span.end
+      private def hasLength: Boolean = span.exists && !span.isZeroExtent
 
     /**Consume head while not an import statement.
      * Returns the rest of the list after the first import, or else the empty list

tests/semanticdb/expect/i9727.expect.scala

@@ -1,5 +1,5 @@
 package i9727
 
 class Test/*<-i9727::Test#*/(a/*<-i9727::Test#a.*/: Int/*->scala::Int#*/)
-val a = new T/*<-i9727::i9727$package.*//*<-i9727::i9727$package.a.*/est/*->i9727::Test#*/(1)
+/*<-i9727::i9727$package.*/val a/*<-i9727::i9727$package.a.*/ = new Test/*->i9727::Test#*/(1)
 val b/*<-i9727::i9727$package.b.*/ = new Test/*->i9727::Test#*/(2)

tests/semanticdb/expect/toplevel.expect.scala

@@ -1,5 +1,6 @@
-inline val a = "/*<-_empty_::toplevel$package.*//*<-_empty_::toplevel$package.a.*/"
+/*<-_empty_::toplevel$package.*/inline val a/*<-_empty_::toplevel$package.a.*/ = ""
 extension (x/*<-_empty_::toplevel$package.extension_combine().(x)*/: Int/*->scala::Int#*/) def combine/*<-_empty_::toplevel$package.extension_combine().*/ (y/*<-_empty_::toplevel$package.extension_combine().(y)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.extension_combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.extension_combine().(y)*/
 def combine/*<-_empty_::toplevel$package.combine().*/(x/*<-_empty_::toplevel$package.combine().(x)*/: Int/*->scala::Int#*/, y/*<-_empty_::toplevel$package.combine().(y)*/: Int/*->scala::Int#*/, z/*<-_empty_::toplevel$package.combine().(z)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.combine().(y)*/ +/*->scala::Int#`+`(+4).*/ z/*->_empty_::toplevel$package.combine().(z)*/
 def combine/*<-_empty_::toplevel$package.combine(+1).*/ = 0
 def foo/*<-_empty_::toplevel$package.foo().*/ = "foo"
+/*<-_empty_::MyProgram#*//*->_empty_::toplevel$package.MyProgram().*//*->scala::util::CommandLineParser.parseArgument().*//*->_empty_::MyProgram#main().(args)*//*->scala::util::FromString.given_FromString_Int.*//*->scala::util::CommandLineParser.showError().*//*->local0*/@main/*->scala::main#*/ def MyProgram/*<-_empty_::toplevel$package.MyProgram().*/(times/*<-_empty_::toplevel$package.MyProgram().(times)*/: Int/*->scala::Int#*/): Unit/*->scala::Unit#*/ = (/*->scala::LowPriorityImplicits#intWrapper().*/1 to/*->scala::runtime::RichInt#to().*/ times/*->_empty_::toplevel$package.MyProgram().(times)*/) foreach/*->scala::collection::immutable::Range#foreach().*/ (_ => println/*->scala::Predef.println(+1).*/("hello"))

tests/semanticdb/expect/toplevel.scala

@@ -3,3 +3,4 @@ extension (x: Int) def combine (y: Int) = x + y
 def combine(x: Int, y: Int, z: Int) = x + y + z
 def combine = 0
 def foo = "foo"
+@main def MyProgram(times: Int): Unit = (1 to times) foreach (_ => println("hello"))

tests/semanticdb/metac.expect

@@ -3070,7 +3070,7 @@ Occurrences:
 [2:10..2:10): <- i9727/Test#`<init>`().
 [2:11..2:12): a <- i9727/Test#a.
 [2:14..2:17): Int -> scala/Int#
-[3:0..3:13): val a = new T <- i9727/i9727$package.
+[3:0..3:0): <- i9727/i9727$package.
 [3:4..3:5): a <- i9727/i9727$package.a.
 [3:12..3:16): Test -> i9727/Test#
 [3:16..3:16): -> i9727/Test#`<init>`().
@@ -3922,11 +3922,17 @@ Schema => SemanticDB v4
 Uri => toplevel.scala
 Text => empty
 Language => Scala
-Symbols => 11 entries
-Occurrences => 24 entries
+Symbols => 18 entries
+Occurrences => 42 entries
 
 Symbols:
+_empty_/MyProgram# => final class MyProgram
+_empty_/MyProgram#`<init>`(). => primary ctor <init>
+_empty_/MyProgram#main(). => static method main
+_empty_/MyProgram#main().(args) => param args
 _empty_/toplevel$package. => final package object _empty_
+_empty_/toplevel$package.MyProgram(). => method MyProgram
+_empty_/toplevel$package.MyProgram().(times) => param times
 _empty_/toplevel$package.a. => val method a
 _empty_/toplevel$package.combine(). => method combine
 _empty_/toplevel$package.combine().(x) => param x
@@ -3937,9 +3943,10 @@ _empty_/toplevel$package.extension_combine(). => method extension_combine
 _empty_/toplevel$package.extension_combine().(x) => param x
 _empty_/toplevel$package.extension_combine().(y) => param y
 _empty_/toplevel$package.foo(). => method foo
+local0 => val local error
 
 Occurrences:
-[0:0..0:16): inline val a = " <- _empty_/toplevel$package.
+[0:0..0:0): <- _empty_/toplevel$package.
 [0:11..0:12): a <- _empty_/toplevel$package.a.
 [1:11..1:12): x <- _empty_/toplevel$package.extension_combine().(x)
 [1:14..1:17): Int -> scala/Int#
@@ -3963,4 +3970,22 @@ Occurrences:
 [2:46..2:47): z -> _empty_/toplevel$package.combine().(z)
 [3:4..3:11): combine <- _empty_/toplevel$package.combine(+1).
 [4:4..4:7): foo <- _empty_/toplevel$package.foo().
+[5:0..5:0): <- _empty_/MyProgram#
+[5:0..5:0): <- _empty_/MyProgram#`<init>`().
+[5:0..5:0): -> _empty_/toplevel$package.MyProgram().
+[5:0..5:0): -> scala/util/CommandLineParser.parseArgument().
+[5:0..5:0): -> _empty_/MyProgram#main().(args)
+[5:0..5:0): -> scala/util/FromString.given_FromString_Int.
+[5:0..5:0): -> scala/util/CommandLineParser.showError().
+[5:0..5:0): -> local0
+[5:1..5:5): main -> scala/main#
+[5:10..5:19): MyProgram <- _empty_/toplevel$package.MyProgram().
+[5:20..5:25): times <- _empty_/toplevel$package.MyProgram().(times)
+[5:27..5:30): Int -> scala/Int#
+[5:33..5:37): Unit -> scala/Unit#
+[5:41..5:41): -> scala/LowPriorityImplicits#intWrapper().
+[5:43..5:45): to -> scala/runtime/RichInt#to().
+[5:46..5:51): times -> _empty_/toplevel$package.MyProgram().(times)
+[5:53..5:60): foreach -> scala/collection/immutable/Range#foreach().
+[5:67..5:74): println -> scala/Predef.println(+1).