other changes by integrating WithEndMarker

Author: soronpo

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

@@ -319,7 +319,7 @@ object Trees {
   extension (mdef: untpd.DefTree) def mods: untpd.Modifiers = mdef.rawMods
 
   sealed trait WithEndMarker[+T <: Untyped]:
-    self: PackageDef[T] | NamedDefTree[T] =>
+    self: PackageDef[T] | NamedDefTree[T] | Apply[T] =>
 
     import WithEndMarker.*
 
@@ -521,6 +521,16 @@ object Trees {
     extends GenericApply[T] with WithEndMarker[T] {
     type ThisTree[+T <: Untyped] = Apply[T]
 
+    protected def srcName(using Context): Name =
+      // Prefer stored method name when present (handles nested Apply cases)
+      this.attachmentOrElse(untpd.MethodName, null) match
+        case name: Name => name
+        case _ =>
+          fun match
+            case Select(_, name) => name
+            case Ident(name) => name
+            case _ => nme.EMPTY
+
     def setApplyKind(kind: ApplyKind) =
       putAttachment(untpd.KindOfApply, kind)
       this

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

@@ -1544,7 +1544,7 @@ object Parsers {
       def updateSpanOfLast(last: T): Unit =
         last match
           case last: WithEndMarker[t] => last.withEndMarker()
-          case apply: Apply if sourceVersion.enablesMethodBlockEndMarkers => apply.setEndMarker()
+          case apply: Apply if sourceVersion.enablesMethodBlockEndMarkers => apply.withEndMarker()
           case _ =>
         last.span = last.span.withEnd(in.lastCharOffset)