resolve end name later

Author: bishabosha

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

@@ -182,7 +182,7 @@ object desugar {
         tpt     = TypeTree(defn.UnitType),
         rhs     = setterRhs
       ).withMods((mods | Accessor) &~ (CaseAccessor | GivenOrImplicit | Lazy))
-       .dropEndSpan
+       .dropEndIndex
       Thicket(vdef1, setter)
     }
     else vdef1
@@ -875,7 +875,7 @@ object desugar {
       val modul = ValDef(moduleName, clsRef, New(clsRef, Nil))
         .withMods(mods.toTermFlags & RetainedModuleValFlags | ModuleValCreationFlags)
         .withSpan(mdef.span.startPos)
-        .withEndSpan(copyFrom=mdef)
+        .withEndIndex(copyFrom=mdef)
       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

@@ -333,35 +333,44 @@ object Trees {
 
     import WithEndMarker.*
 
-    final def endToken: SimpleName = endMarker.stripModuleClassSuffix.lastPart
+    final def endSpan(using Context): Span =
+      self.getAttachment(EndIndex) match
+        case Some(end) =>
+          val realName = endName.stripModuleClassSuffix.lastPart
+          Span(end - realName.length, end)
+        case none => NoSpan
 
-    protected def endMarker: Name
+    protected def endName(using Context): Name
 
-    final def withEndSpan(span: Span): self.type =
-      self.withAttachment(EndMarker, span)
+    final def withEndIndex(index: Int): self.type =
+      self.withAttachment(EndIndex, index)
 
-    final def withEndSpan(copyFrom: WithEndMarker): self.type =
-      copyFrom.endSpan.foreach(span => withEndSpan(span=span))
+    final def withEndIndex(copyFrom: WithEndMarker): self.type =
+      copyFrom.endIndex.foreach(index => withEndIndex(index))
       this
 
-    final def dropEndSpan: self.type =
-      self.removeAttachment(EndMarker)
+    final def dropEndIndex: self.type =
+      self.removeAttachment(EndIndex)
       this
 
-    final def endSpan: Option[Span] = self.getAttachment(EndMarker)
+    protected def endIndex: Option[Int] = self.getAttachment(EndIndex)
 
   object WithEndMarker:
     /** Property key for trees with an `end` marker */
-    private val EndMarker: Property.StickyKey[Span] = Property.StickyKey()
+    private val EndIndex: Property.StickyKey[Int] = Property.StickyKey()
 
   end WithEndMarker
 
   abstract class NamedDefTree[-T >: Untyped](implicit @constructorOnly src: SourceFile)
   extends NameTree[T] with DefTree[T] with WithEndMarker {
     type ThisTree[-T >: Untyped] <: NamedDefTree[T]
 
-    protected def endMarker =
+    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
       else name
 
     /** The position of the name defined by this definition.
@@ -376,7 +385,6 @@ object Trees {
         val point = span.point
         if (rawMods.is(Synthetic) || span.isSynthetic || name.toTermName == nme.ERROR) Span(point)
         else {
-          val srcName = if symbol.isPackageObject then symbol.owner.name else name
           val realName = srcName.stripModuleClassSuffix.lastPart
           Span(point, point + realName.length, point)
         }
@@ -895,7 +903,7 @@ object Trees {
     extends ProxyTree[T] with WithEndMarker {
     type ThisTree[-T >: Untyped] = PackageDef[T]
     def forwardTo: RefTree[T] = pid
-    protected def endMarker: Name = pid.name
+    protected def endName(using Context): Name = pid.name
   }
 
   /** arg @annot */

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1300,8 +1300,7 @@ object Parsers {
         if didMatch then
           stat match
             case stat: WithEndMarker =>
-              val end = in.lastCharOffset
-              stat.withEndSpan(span=Span(end - stat.endToken.length, end))
+              stat.withEndIndex(index=in.lastCharOffset)
             case _ =>
               ()
         didMatch

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

@@ -241,7 +241,8 @@ class ExtractSemanticDB extends Phase:
 
       tree match
         case tree: WithEndMarker =>
-          for endSpan <- tree.endSpan do
+          val endSpan = tree.endSpan
+          if endSpan.exists then
             registerUseGuarded(None, tree.symbol, endSpan, tree.source)
         case _ =>