refactor names

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))
-       .dropEndIndex
+       .dropEndIndex() // the end marker should only appear on the getter definition
       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)
-        .withEndIndex(copyFrom=mdef)
+        .withEndIndex(copyFrom = mdef) // copy over the end market 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

@@ -346,10 +346,10 @@ object Trees {
       self.withAttachment(EndIndex, index)
 
     final def withEndIndex(copyFrom: WithEndMarker): self.type =
-      copyFrom.endIndex.foreach(index => withEndIndex(index))
+      copyFrom.endIndex.foreach(withEndIndex)
       this
 
-    final def dropEndIndex: self.type =
+    final def dropEndIndex(): self.type =
       self.removeAttachment(EndIndex)
       this
 

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

@@ -1293,20 +1293,20 @@ object Parsers {
         case _: (ForYield | ForDo) => in.token == FOR
         case _ => false
 
-      def matchesWithUpdated(stat: Tree): Boolean = {
+      def matchesAndSetEnd(stat: Tree): Boolean = {
         val didMatch = matches(stat)
         if didMatch then
           stat match
             case stat: WithEndMarker =>
-              stat.withEndIndex(index=in.lastCharOffset)
+              stat.withEndIndex(index = in.lastCharOffset)
             case _ =>
               ()
         didMatch
       }
 
       if in.token == END then
         val start = in.skipToken()
-        if stats.isEmpty || !matchesWithUpdated(stats.last) then
+        if stats.isEmpty || !matchesAndSetEnd(stats.last) then
           syntaxError("misaligned end marker", Span(start, in.lastCharOffset))
         in.token = IDENTIFIER // Leaving it as the original token can confuse newline insertion
         in.nextToken()