Merge pull request #8720 from dotty-staging/fix-#8717

Fix #8716 and fix #8717: Add missing extension span

Author: nicolasstucki

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

@@ -3573,6 +3573,7 @@ object Parsers {
      */
     def extensionDef(start: Offset, mods: Modifiers): ModuleDef =
       in.nextToken()
+      val nameOffset = in.offset
       val name = if isIdent && !isIdent(nme.on) then ident() else EmptyTermName
       in.endMarkerScope(if name.isEmpty then nme.extension else name) {
         val (tparams, vparamss, extensionFlag) =
@@ -3588,7 +3589,7 @@ object Parsers {
         if !in.isNestedStart then syntaxError("Extension without extension methods")
         val templ = templateBodyOpt(makeConstructor(tparams, vparamss), Nil, Nil)
         templ.body.foreach(checkExtensionMethod(tparams, vparamss, _))
-        val edef = ModuleDef(name, templ)
+        val edef = atSpan(start, nameOffset, in.offset)(ModuleDef(name, templ))
         finalizeDef(edef, addFlag(mods, Given | extensionFlag), start)
       }
 

compiler/test-resources/repl/i8716_i8717

@@ -0,0 +1,14 @@
+scala>extension { }
+1 |extension { }
+  |^
+  |anonymous instance must implement a type or have at least one extension method
+scala> extension as on
+1 | extension as on
+  |                ^
+  |                '(' expected, but eof found
+scala> extension as on (s
+1 | extension as on (s
+  |                   ^
+  |                   ':' expected, but eof found
+scala> extension as on (s: String) { def expand = ??? }
+// defined object as

tests/semanticdb/expect/Givens.expect.scala

@@ -4,10 +4,10 @@ package b
 object Givens/*<-a::b::Givens.*/:
 
   extension on [A](any: A):
-    def /*<-a::b::Givens.extension_sayHello_A.*//*<-a::b::Givens.extension_sayHello_A.sayHello().[A]*//*<-a::b::Givens.extension_sayHello_A.sayHello().(any)*//*->a::b::Givens.extension_sayHello_A.sayHello().[A]*/sayHello/*<-a::b::Givens.extension_sayHello_A.sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.extension_sayHello_A.sayHello().(any)*/"/*->scala::StringContext#s().*/
+    /*<-a::b::Givens.extension_sayHello_A.*//*<-a::b::Givens.extension_sayHello_A.sayHello().[A]*//*<-a::b::Givens.extension_sayHello_A.sayHello().(any)*//*->a::b::Givens.extension_sayHello_A.sayHello().[A]*/def sayHello/*<-a::b::Givens.extension_sayHello_A.sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.extension_sayHello_A.sayHello().(any)*/"/*->scala::StringContext#s().*/
 
   extension on [B](any: B):
-    def sa/*<-a::b::Givens.extension_sayGoodbye_B.*//*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().[B]*//*<-a::b::Givens.extension_sayGoodbye_B.saySoLong().[B]*//*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().(any)*//*<-a::b::Givens.extension_sayGoodbye_B.saySoLong().(any)*//*->a::b::Givens.extension_sayGoodbye_B.sayGoodbye().[B]*//*->a::b::Givens.extension_sayGoodbye_B.saySoLong().[B]*/yGoodbye/*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.extension_sayGoodbye_B.sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
+    de/*<-a::b::Givens.extension_sayGoodbye_B.*//*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().[B]*//*<-a::b::Givens.extension_sayGoodbye_B.saySoLong().[B]*//*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().(any)*//*<-a::b::Givens.extension_sayGoodbye_B.saySoLong().(any)*//*->a::b::Givens.extension_sayGoodbye_B.sayGoodbye().[B]*//*->a::b::Givens.extension_sayGoodbye_B.saySoLong().[B]*/f sayGoodbye/*<-a::b::Givens.extension_sayGoodbye_B.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.extension_sayGoodbye_B.sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
     def saySoLong/*<-a::b::Givens.extension_sayGoodbye_B.saySoLong().*/ = s"/*->scala::StringContext.apply().*/So Long, from $any/*->a::b::Givens.extension_sayGoodbye_B.saySoLong().(any)*/"/*->scala::StringContext#s().*/
 
   val hello1/*<-a::b::Givens.hello1.*/ = /*->a::b::Givens.extension_sayHello_A.sayHello().*/1.sayHello

tests/semanticdb/metac.expect

@@ -1308,15 +1308,15 @@ Occurrences:
 [0:8..0:9): a <- a/
 [1:8..1:9): b <- a/b/
 [3:7..3:13): Givens <- a/b/Givens.
-[5:16..6:8): <- a/b/Givens.extension_sayHello_A.
+[5:12..6:4): <- a/b/Givens.extension_sayHello_A.
 [5:16..5:17): A <- a/b/Givens.extension_sayHello_A.sayHello().[A]
 [5:19..5:22): any <- a/b/Givens.extension_sayHello_A.sayHello().(any)
 [5:24..5:25): A -> a/b/Givens.extension_sayHello_A.sayHello().[A]
 [6:8..6:16): sayHello <- a/b/Givens.extension_sayHello_A.sayHello().
 [6:21..6:21): -> scala/StringContext.apply().
 [6:34..6:37): any -> a/b/Givens.extension_sayHello_A.sayHello().(any)
 [6:37..6:38): " -> scala/StringContext#s().
-[8:16..9:10): <- a/b/Givens.extension_sayGoodbye_B.
+[8:12..9:6): <- a/b/Givens.extension_sayGoodbye_B.
 [8:16..8:17): B <- a/b/Givens.extension_sayGoodbye_B.sayGoodbye().[B]
 [8:16..8:17): B <- a/b/Givens.extension_sayGoodbye_B.saySoLong().[B]
 [8:19..8:22): any <- a/b/Givens.extension_sayGoodbye_B.sayGoodbye().(any)