escape ctor in srcName

Author: bishabosha

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

@@ -875,7 +875,7 @@ object desugar {
       val modul = ValDef(moduleName, clsRef, New(clsRef, Nil))
         .withMods(mods.toTermFlags & RetainedModuleValFlags | ModuleValCreationFlags)
         .withSpan(mdef.span.startPos)
-        .withEndIndex(copyFrom = mdef) // copy over the end market position to the module val
+        .withEndIndex(copyFrom = mdef) // copy over the end marker position to the module val
       val ValDef(selfName, selfTpt, _) = impl.self
       val selfMods = impl.self.mods
       if (!selfTpt.isEmpty) report.error(ObjectMayNotHaveSelfType(mdef), impl.self.srcPos)

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

@@ -336,11 +336,11 @@ object Trees {
     final def endSpan(using Context): Span =
       self.getAttachment(EndIndex) match
         case Some(end) =>
-          val realName = endName.stripModuleClassSuffix.lastPart
+          val realName = srcName.stripModuleClassSuffix.lastPart
           Span(end - realName.length, end)
         case none => NoSpan
 
-    protected def endName(using Context): Name
+    protected def srcName(using Context): Name
 
     final def withEndIndex(index: Int): self.type =
       self.withAttachment(EndIndex, index)
@@ -365,12 +365,9 @@ object Trees {
   extends NameTree[T] with DefTree[T] with WithEndMarker {
     type ThisTree[-T >: Untyped] <: NamedDefTree[T]
 
-    protected def endName(using Context) =
-      if name == nme.CONSTRUCTOR then nme.this_
-      else srcName
-
     protected def srcName(using Context): Name =
-      if symbol.isPackageObject then symbol.owner.name
+      if name == nme.CONSTRUCTOR then nme.this_
+      else if symbol.isPackageObject then symbol.owner.name
       else name
 
     /** The position of the name defined by this definition.
@@ -903,7 +900,7 @@ object Trees {
     extends ProxyTree[T] with WithEndMarker {
     type ThisTree[-T >: Untyped] = PackageDef[T]
     def forwardTo: RefTree[T] = pid
-    protected def endName(using Context): Name = pid.name
+    protected def srcName(using Context): Name = pid.name
   }
 
   /** arg @annot */

tests/semanticdb/expect/Annotations.expect.scala

@@ -21,7 +21,7 @@ class Annotations/*<-annot::Annotations#*/[@TypeParameterAnnotation/*->com::java
 
 class B/*<-annot::B#*/ @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/()(x/*<-annot::B#x.*/: Int/*->scala::Int#*/) {
   @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/
-  def this()/*<-annot::B#`<init>`(+1).*/ = this(42)
+  def this/*<-annot::B#`<init>`(+1).*/() = this(42)
 }
 
 @ObjectAnnotation/*->com::javacp::annot::ObjectAnnotation#*/

tests/semanticdb/expect/EndMarkers.expect.scala

@@ -1,7 +1,7 @@
 package endmarkers:
 
   class MultiCtor/*<-endmarkers::MultiCtor#*/(val i/*<-endmarkers::MultiCtor#i.*/: Int/*->scala::Int#*/):
-    def this()/*<-endmarkers::MultiCtor#`<init>`(+1).*/ =
+    def this/*<-endmarkers::MultiCtor#`<init>`(+1).*/() =
       this(23)
     end this/*->endmarkers::MultiCtor#`<init>`(+1).*/
   end MultiCtor/*->endmarkers::MultiCtor#*/

tests/semanticdb/expect/semanticdb-Flags.expect.scala

@@ -8,8 +8,8 @@ package object p/*<-flags::p::package.*/ {
   def z/*<-flags::p::package.z().*/(pp/*<-flags::p::package.z().(pp)*/: Int/*->scala::Int#*/) = 3
   def m/*<-flags::p::package.m().*/[TT/*<-flags::p::package.m().[TT]*/]: Int/*->scala::Int#*/ = macro ???/*->scala::Predef.`???`().*/
   abstract class C/*<-flags::p::package.C#*/[+T/*<-flags::p::package.C#[T]*/, -U/*<-flags::p::package.C#[U]*/, V/*<-flags::p::package.C#[V]*/](x/*<-flags::p::package.C#x.*/: T/*->flags::p::package.C#[T]*/, y/*<-flags::p::package.C#y.*/: U/*->flags::p::package.C#[U]*/, z/*<-flags::p::package.C#z.*/: V/*->flags::p::package.C#[V]*/) {
-    def this()/*<-flags::p::package.C#`<init>`(+1).*/ = this(???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
-    def this(t/*<-flags::p::package.C#`<init>`(+2).*//*<-flags::p::package.C#`<init>`(+2).(t)*/: T/*->flags::p::package.C#[T]*/) = this(t/*->flags::p::package.C#`<init>`(+2).(t)*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
+    def this/*<-flags::p::package.C#`<init>`(+1).*/() = this(???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
+    def this/*<-flags::p::package.C#`<init>`(+2).*/(t/*<-flags::p::package.C#`<init>`(+2).(t)*/: T/*->flags::p::package.C#[T]*/) = this(t/*->flags::p::package.C#`<init>`(+2).(t)*/, ???/*->scala::Predef.`???`().*/, ???/*->scala::Predef.`???`().*/)
     def w/*<-flags::p::package.C#w().*/: Int/*->scala::Int#*/
   }
   type T1/*<-flags::p::package.T1#*/ = Int/*->scala::Int#*/

tests/semanticdb/metac.expect

@@ -252,7 +252,7 @@ Occurrences:
 [21:33..21:34): x <- annot/B#x.
 [21:36..21:39): Int -> scala/Int#
 [22:3..22:24): ConstructorAnnotation -> com/javacp/annot/ConstructorAnnotation#
-[23:6..23:12): <- annot/B#`<init>`(+1).
+[23:6..23:10): <- annot/B#`<init>`(+1).
 [23:20..23:20): -> annot/B#`<init>`().
 [26:1..26:17): ObjectAnnotation -> com/javacp/annot/ObjectAnnotation#
 [27:7..27:8): M <- annot/M.
@@ -701,7 +701,7 @@ Occurrences:
 [2:17..2:17): <- endmarkers/MultiCtor#`<init>`().
 [2:22..2:23): i <- endmarkers/MultiCtor#i.
 [2:25..2:28): Int -> scala/Int#
-[3:8..3:14): <- endmarkers/MultiCtor#`<init>`(+1).
+[3:8..3:12): <- endmarkers/MultiCtor#`<init>`(+1).
 [4:11..4:11): -> endmarkers/MultiCtor#`<init>`().
 [5:8..5:12): this -> endmarkers/MultiCtor#`<init>`(+1).
 [6:6..6:15): MultiCtor -> endmarkers/MultiCtor#
@@ -3856,12 +3856,12 @@ Occurrences:
 [9:39..9:40): U -> flags/p/package.C#[U]
 [9:42..9:43): z <- flags/p/package.C#z.
 [9:45..9:46): V -> flags/p/package.C#[V]
-[10:8..10:14): <- flags/p/package.C#`<init>`(+1).
+[10:8..10:12): <- flags/p/package.C#`<init>`(+1).
 [10:22..10:22): -> flags/p/package.C#`<init>`().
 [10:22..10:25): ??? -> scala/Predef.`???`().
 [10:27..10:30): ??? -> scala/Predef.`???`().
 [10:32..10:35): ??? -> scala/Predef.`???`().
-[11:8..11:14): <- flags/p/package.C#`<init>`(+2).
+[11:8..11:12): <- flags/p/package.C#`<init>`(+2).
 [11:13..11:14): t <- flags/p/package.C#`<init>`(+2).(t)
 [11:16..11:17): T -> flags/p/package.C#[T]
 [11:26..11:26): -> flags/p/package.C#`<init>`().