Fix span of default getter

Author: som-snytt

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

@@ -393,18 +393,14 @@ object desugar {
           rhs
       cpy.TypeDef(tparam)(rhs = dropInRhs(tparam.rhs))
 
-    def paramssNoRHS = mapParamss(meth.paramss)(identity) {
-      vparam =>
-        if vparam.rhs.isEmpty then vparam
-        else cpy.ValDef(vparam)(rhs = EmptyTree).withMods(vparam.mods | HasDefault)
-    }
+    def paramssNoRHS = mapParamss(meth.paramss)(identity): vparam =>
+      if vparam.rhs.isEmpty then vparam
+      else cpy.ValDef(vparam)(rhs = EmptyTree).withMods(vparam.mods | HasDefault)
 
     def getterParamss(n: Int): List[ParamClause] =
-      mapParamss(takeUpTo(paramssNoRHS, n)) {
-        tparam => dropContextBounds(toMethParam(tparam, KeepAnnotations.All))
-      } {
-        vparam => toMethParam(vparam, KeepAnnotations.All, keepDefault = false)
-      }
+      mapParamss(takeUpTo(paramssNoRHS, n))
+        (tparam => dropContextBounds(toMethParam(tparam, KeepAnnotations.All)))
+        (vparam => toMethParam(vparam, KeepAnnotations.All, keepDefault = false))
 
     def defaultGetters(paramss: List[ParamClause], n: Int): List[DefDef] = paramss match
       case ValDefs(vparam :: vparams) :: paramss1 =>
@@ -418,6 +414,7 @@ object desugar {
           .withMods(Modifiers(
             meth.mods.flags & (AccessFlags | Synthetic) | (vparam.mods.flags & Inline),
             meth.mods.privateWithin))
+          .withSpan(vparam.rhs.span)
         val rest = defaultGetters(vparams :: paramss1, n + 1)
         if vparam.rhs.isEmpty then rest else defaultGetter :: rest
       case _ :: paramss1 =>  // skip empty parameter lists and type parameters

tests/warn/i12460.check

@@ -8,10 +8,10 @@
   | Although extensions are ordinary methods, they must be invoked as a selection.
   | Therefore, the receiver cannot be omitted. A default argument for that parameter would never be used.
    ---------------------------------------------------------------------------------------------------------------------
--- [E208] Potential Issue Warning: tests/warn/i12460.scala:5:17 --------------------------------------------------------
+-- [E208] Potential Issue Warning: tests/warn/i12460.scala:5:37 --------------------------------------------------------
 5 |extension (using String)(s: String = "hello, world") def revert = s.reverse.toUpperCase // warn
-  |                 ^
-  |                 Extension method revert should not have a default argument for its receiver.
+  |                                     ^
+  |                                     Extension method revert should not have a default argument for its receiver.
   |---------------------------------------------------------------------------------------------------------------------
   | Explanation (enabled by `-explain`)
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

tests/warn/i12460.scala

@@ -1,7 +1,9 @@
-//> using options -explain
+//> using options -explain -Ystop-after:refchecks
 
 extension (s: String = "hello, world") def invert = s.reverse.toUpperCase // warn
 
 extension (using String)(s: String = "hello, world") def revert = s.reverse.toUpperCase // warn
 
-extension (s: String) def divert(m: String  = "hello, world") = (s+m).reverse.toUpperCase // ok
+extension (s: String)
+  def divert(m: String = "hello, world") = (s+m).reverse.toUpperCase // ok
+  def divertimento(using String)(m: String = "hello, world") = (s+m).reverse.toUpperCase // ok