Merge pull request #11574 from Kordyjan/extensions-position

Retain position of extension function calls

Author: Kordyjan

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

@@ -415,6 +415,18 @@ object Trees {
         qualifier.typeOpt.member(name).atSignature(Signature.NotAMethod, name)
       case _ =>
         super.denot
+
+    def nameSpan(using Context): Span =
+      if span.exists then
+        val point = span.point
+        if name.toTermName == nme.ERROR then
+          Span(point)
+        else if qualifier.span.start > span.start then // right associative
+          val realName = name.stripModuleClassSuffix.lastPart
+          Span(span.start, span.start + realName.length, point)
+        else
+          Span(point, span.end, point)
+      else span
   }
 
   class SelectWithSig[-T >: Untyped] private[ast] (qualifier: Tree[T], name: Name, val sig: Signature)(implicit @constructorOnly src: SourceFile)

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2988,7 +2988,7 @@ class Typer extends Namer
     def tryExtension(using Context): Tree =
       findRef(tree.name, WildcardType, ExtensionMethod, EmptyFlags, qual.srcPos) match
         case ref: TermRef =>
-          extMethodApply(untpd.ref(ref).withSpan(tree.span), qual, pt)
+          extMethodApply(untpd.TypedSplice(tpd.ref(ref).withSpan(tree.nameSpan)), qual, pt)
         case _ =>
           EmptyTree
 

tests/semanticdb/expect/Enums.expect.scala

@@ -52,7 +52,7 @@ object Enums/*<-_empty_::Enums.*/:
   extension [A/*<-_empty_::Enums.unwrap().[A]*/, B/*<-_empty_::Enums.unwrap().[B]*/](opt/*<-_empty_::Enums.unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.unwrap().[A]*/]) def unwrap/*<-_empty_::Enums.unwrap().*/(using ev/*<-_empty_::Enums.unwrap().(ev)*/: A/*->_empty_::Enums.unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/] = ev/*->_empty_::Enums.unwrap().(ev)*/ match
     case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local0*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])
 
-  val some1/*<-_empty_::Enums.some1.*/ = /*->_empty_::Enums.unwrap().*/Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1)).unwrap/*->_empty_::Enums.`<:<`.given_T().*/
+  val some1/*<-_empty_::Enums.some1.*/ = Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1)).unwrap/*->_empty_::Enums.unwrap().*//*->_empty_::Enums.`<:<`.given_T().*/
 
   enum Planet/*<-_empty_::Enums.Planet#*/(mass/*<-_empty_::Enums.Planet#mass.*/: Double/*->scala::Double#*/, radius/*<-_empty_::Enums.Planet#radius.*/: Double/*->scala::Double#*/) extends Enum/*->java::lang::Enum#*/[Planet/*->_empty_::Enums.Planet#*/]/*->java::lang::Enum#`<init>`().*/:
     private final val G/*<-_empty_::Enums.Planet#G.*/ = 6.67300E-11

tests/semanticdb/expect/Extension.expect.scala

@@ -0,0 +1,9 @@
+package ext
+
+/*<-ext::Extension$package.*/extension (s/*<-ext::Extension$package.foo().(s)*//*<-ext::Extension$package.`#*#`().(s)*/: String/*->scala::Predef.String#*/)
+  def foo/*<-ext::Extension$package.foo().*/: Int/*->scala::Int#*/ = 42
+  def #*#/*<-ext::Extension$package.`#*#`().*/ (i/*<-ext::Extension$package.`#*#`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (/*->scala::Tuple2.apply().*/s/*->ext::Extension$package.`#*#`().(s)*/, i/*->ext::Extension$package.`#*#`().(i)*/)
+
+val a/*<-ext::Extension$package.a.*/ = "asd".foo/*->ext::Extension$package.foo().*/
+
+val c/*<-ext::Extension$package.c.*/ = "foo" #*#/*->ext::Extension$package.`#*#`().*/ 23

tests/semanticdb/expect/Extension.scala

@@ -0,0 +1,9 @@
+package ext
+
+extension (s: String)
+  def foo: Int = 42
+  def #*# (i: Int): (String, Int) = (s, i)
+
+val a = "asd".foo
+
+val c = "foo" #*# 23

tests/semanticdb/expect/Givens.expect.scala

@@ -10,9 +10,9 @@ object Givens/*<-a::b::Givens.*/:
     def sayGoodbye/*<-a::b::Givens.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
     def saySoLong/*<-a::b::Givens.saySoLong().*/ = s"/*->scala::StringContext.apply().*/So Long, from $any/*->a::b::Givens.saySoLong().(any)*/"/*->scala::StringContext#s().*/
 
-  val hello1/*<-a::b::Givens.hello1.*/ = /*->a::b::Givens.sayHello().*/1.sayHello
-  val goodbye1/*<-a::b::Givens.goodbye1.*/ = /*->a::b::Givens.sayGoodbye().*/1.sayGoodbye
-  val soLong1/*<-a::b::Givens.soLong1.*/ = /*->a::b::Givens.saySoLong().*/1.saySoLong
+  val hello1/*<-a::b::Givens.hello1.*/ = 1.sayHello/*->a::b::Givens.sayHello().*/
+  val goodbye1/*<-a::b::Givens.goodbye1.*/ = 1.sayGoodbye/*->a::b::Givens.sayGoodbye().*/
+  val soLong1/*<-a::b::Givens.soLong1.*/ = 1.saySoLong/*->a::b::Givens.saySoLong().*/
 
   trait Monoid/*<-a::b::Givens.Monoid#*/[A/*<-a::b::Givens.Monoid#[A]*/]:
     def empty/*<-a::b::Givens.Monoid#empty().*/: A/*->a::b::Givens.Monoid#[A]*/

tests/semanticdb/expect/RightAssociativeExtension.expect.scala

@@ -0,0 +1,6 @@
+package ext
+
+/*<-ext::RightAssociativeExtension$package.*/extension (s/*<-ext::RightAssociativeExtension$package.`:*:`().(s)*/: String/*->scala::Predef.String#*/)
+  def :*:/*<-ext::RightAssociativeExtension$package.`:*:`().*/ (i/*<-ext::RightAssociativeExtension$package.`:*:`().(i)*/: Int/*->scala::Int#*/): (String/*->scala::Predef.String#*/, Int/*->scala::Int#*/) = (/*->scala::Tuple2.apply().*/s/*->ext::RightAssociativeExtension$package.`:*:`().(s)*/, i/*->ext::RightAssociativeExtension$package.`:*:`().(i)*/)
+
+val b/*<-ext::RightAssociativeExtension$package.b.*/ = "foo" :*:/*->ext::RightAssociativeExtension$package.`:*:`().*/ 23

tests/semanticdb/expect/RightAssociativeExtension.scala

@@ -0,0 +1,6 @@
+package ext
+
+extension (s: String)
+  def :*: (i: Int): (String, Int) = (s, i)
+
+val b = "foo" :*: 23

tests/semanticdb/metac.expect

@@ -992,11 +992,11 @@ Occurrences:
 [52:40..52:46): Option -> scala/Option#
 [52:47..52:48): B -> _empty_/Enums.unwrap().[B]
 [54:6..54:11): some1 <- _empty_/Enums.some1.
-[54:14..54:14): -> _empty_/Enums.unwrap().
 [54:14..54:18): Some -> scala/Some.
 [54:18..54:18): -> scala/Some.apply().
 [54:19..54:23): Some -> scala/Some.
 [54:23..54:23): -> scala/Some.apply().
+[54:28..54:34): unwrap -> _empty_/Enums.unwrap().
 [54:34..54:34): -> _empty_/Enums.`<:<`.given_T().
 [56:7..56:13): Planet <- _empty_/Enums.Planet#
 [56:13..56:13): <- _empty_/Enums.Planet#`<init>`().
@@ -1130,6 +1130,48 @@ Occurrences:
 [9:33..9:36): Int -> scala/Int#
 [9:37..9:37): -> scala/reflect/ClassTag.apply().
 
+expect/Extension.scala
+----------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => Extension.scala
+Text => empty
+Language => Scala
+Symbols => 8 entries
+Occurrences => 19 entries
+
+Symbols:
+ext/Extension$package. => final package object ext
+ext/Extension$package.`#*#`(). => method #*#
+ext/Extension$package.`#*#`().(i) => param i
+ext/Extension$package.`#*#`().(s) => param s
+ext/Extension$package.a. => val method a
+ext/Extension$package.c. => val method c
+ext/Extension$package.foo(). => method foo
+ext/Extension$package.foo().(s) => param s
+
+Occurrences:
+[0:8..0:11): ext <- ext/
+[2:0..2:0): <- ext/Extension$package.
+[2:11..2:12): s <- ext/Extension$package.foo().(s)
+[2:11..2:12): s <- ext/Extension$package.`#*#`().(s)
+[2:14..2:20): String -> scala/Predef.String#
+[3:6..3:9): foo <- ext/Extension$package.foo().
+[3:11..3:14): Int -> scala/Int#
+[4:6..4:9): #*# <- ext/Extension$package.`#*#`().
+[4:11..4:12): i <- ext/Extension$package.`#*#`().(i)
+[4:14..4:17): Int -> scala/Int#
+[4:21..4:27): String -> scala/Predef.String#
+[4:29..4:32): Int -> scala/Int#
+[4:37..4:37): -> scala/Tuple2.apply().
+[4:37..4:38): s -> ext/Extension$package.`#*#`().(s)
+[4:40..4:41): i -> ext/Extension$package.`#*#`().(i)
+[6:4..6:5): a <- ext/Extension$package.a.
+[6:14..6:17): foo -> ext/Extension$package.foo().
+[8:4..8:5): c <- ext/Extension$package.c.
+[8:14..8:17): #*# -> ext/Extension$package.`#*#`().
+
 expect/ForComprehension.scala
 -----------------------------
 
@@ -1314,11 +1356,11 @@ Occurrences:
 [10:37..10:40): any -> a/b/Givens.saySoLong().(any)
 [10:40..10:41): " -> scala/StringContext#s().
 [12:6..12:12): hello1 <- a/b/Givens.hello1.
-[12:15..12:15): -> a/b/Givens.sayHello().
+[12:17..12:25): sayHello -> a/b/Givens.sayHello().
 [13:6..13:14): goodbye1 <- a/b/Givens.goodbye1.
-[13:17..13:17): -> a/b/Givens.sayGoodbye().
+[13:19..13:29): sayGoodbye -> a/b/Givens.sayGoodbye().
 [14:6..14:13): soLong1 <- a/b/Givens.soLong1.
-[14:16..14:16): -> a/b/Givens.saySoLong().
+[14:18..14:27): saySoLong -> a/b/Givens.saySoLong().
 [16:8..16:14): Monoid <- a/b/Givens.Monoid#
 [16:14..16:14): <- a/b/Givens.Monoid#`<init>`().
 [16:15..16:16): A <- a/b/Givens.Monoid#[A]
@@ -2414,6 +2456,40 @@ Occurrences:
 [31:10..31:11): T -> prefixes/M.T#
 [31:14..31:17): ??? -> scala/Predef.`???`().
 
+expect/RightAssociativeExtension.scala
+--------------------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => RightAssociativeExtension.scala
+Text => empty
+Language => Scala
+Symbols => 5 entries
+Occurrences => 14 entries
+
+Symbols:
+ext/RightAssociativeExtension$package. => final package object ext
+ext/RightAssociativeExtension$package.`:*:`(). => method :*:
+ext/RightAssociativeExtension$package.`:*:`().(i) => param i
+ext/RightAssociativeExtension$package.`:*:`().(s) => param s
+ext/RightAssociativeExtension$package.b. => val method b
+
+Occurrences:
+[0:8..0:11): ext <- ext/
+[2:0..2:0): <- ext/RightAssociativeExtension$package.
+[2:11..2:12): s <- ext/RightAssociativeExtension$package.`:*:`().(s)
+[2:14..2:20): String -> scala/Predef.String#
+[3:6..3:9): :*: <- ext/RightAssociativeExtension$package.`:*:`().
+[3:11..3:12): i <- ext/RightAssociativeExtension$package.`:*:`().(i)
+[3:14..3:17): Int -> scala/Int#
+[3:21..3:27): String -> scala/Predef.String#
+[3:29..3:32): Int -> scala/Int#
+[3:37..3:37): -> scala/Tuple2.apply().
+[3:37..3:38): s -> ext/RightAssociativeExtension$package.`:*:`().(s)
+[3:40..3:41): i -> ext/RightAssociativeExtension$package.`:*:`().(i)
+[5:4..5:5): b <- ext/RightAssociativeExtension$package.b.
+[5:14..5:17): :*: -> ext/RightAssociativeExtension$package.`:*:`().
+
 expect/Selfs.scala
 ------------------