semanticdb: drop extension_ for extension methods

Author: bishabosha

compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala

@@ -143,7 +143,7 @@ class ExtractSemanticDB extends Phase:
             return
           if !excludeDef(tree.symbol)
           && tree.span.hasLength then
-            registerDefinition(tree.symbol, tree.nameSpan, symbolKinds(tree), tree.source)
+            registerDefinition(tree.symbol, tree.adjustedNameSpan, symbolKinds(tree), tree.source)
             val privateWithin = tree.symbol.privateWithin
             if privateWithin.exists then
               registerUseGuarded(None, privateWithin, spanOfSymbol(privateWithin, tree.span, tree.source), tree.source)
@@ -283,6 +283,14 @@ class ExtractSemanticDB extends Phase:
 
     end PatternValDef
 
+    extension (tree: NamedDefTree):
+      private def adjustedNameSpan(using Context): Span =
+        val span = tree.nameSpan
+        if tree.symbol.is(ExtensionMethod) && tree.name.isExtensionName then
+          span.withEnd(span.end - ExtractSemanticDB.extensionPrefixLength)
+        else
+          span
+
     /** Add semanticdb name of the given symbol to string builder */
     private def addSymName(b: StringBuilder, sym: Symbol)(using Context): Unit =
 
@@ -592,6 +600,8 @@ object ExtractSemanticDB:
 
   val name: String = "extractSemanticDB"
 
+  final val extensionPrefixLength = "extension_".length
+
   def write(source: SourceFile, occurrences: List[SymbolOccurrence], symbolInfos: List[SymbolInformation])(using Context): Unit =
     def absolutePath(path: Path): Path = path.toAbsolutePath.normalize
     def commonPrefix[T](z: T)(i1: Iterable[T], i2: Iterable[T])(app: (T, T) => T): T =

tests/semanticdb/expect/Enums.expect.scala

@@ -12,10 +12,10 @@ object Enums/*<-_empty_::Enums.*/:
     case Hearts/*<-_empty_::Enums.Suits.Hearts.*/, Spades/*<-_empty_::Enums.Suits.Spades.*/, Clubs/*<-_empty_::Enums.Suits.Clubs.*/, Diamonds/*<-_empty_::Enums.Suits.Diamonds.*/
 
   object Suits/*<-_empty_::Enums.Suits.*/:
-    extension (suit/*<-_empty_::Enums.Suits.extension_isRed().(suit)*/: Suits/*->_empty_::Enums.Suits#*/) def isRed: Boolean /*<-_empty_::Enums.Suits.extension_isRed().*//*->scala::Boolean#*/=
+    extension (suit/*<-_empty_::Enums.Suits.extension_isRed().(suit)*/: Suits/*->_empty_::Enums.Suits#*/) def isRed/*<-_empty_::Enums.Suits.extension_isRed().*/: Boolean/*->scala::Boolean#*/ =
       suit/*->_empty_::Enums.Suits.extension_isRed().(suit)*/ ==/*->scala::Any#`==`().*/ Hearts/*->_empty_::Enums.Suits.Hearts.*/ ||/*->scala::Boolean#`||`().*/ suit/*->_empty_::Enums.Suits.extension_isRed().(suit)*/ ==/*->scala::Any#`==`().*/ Diamonds/*->_empty_::Enums.Suits.Diamonds.*/
 
-    extension (suit/*<-_empty_::Enums.Suits.extension_isBlack().(suit)*/: Suits/*->_empty_::Enums.Suits#*/) def isBlack: Boolean /*<-_empty_::Enums.Suits.extension_isBlack().*//*->scala::Boolean#*/= suit/*->_empty_::Enums.Suits.extension_isBlack().(suit)*/ match
+    extension (suit/*<-_empty_::Enums.Suits.extension_isBlack().(suit)*/: Suits/*->_empty_::Enums.Suits#*/) def isBlack/*<-_empty_::Enums.Suits.extension_isBlack().*/: Boolean/*->scala::Boolean#*/ = suit/*->_empty_::Enums.Suits.extension_isBlack().(suit)*/ match
       case Spades/*->_empty_::Enums.Suits.Spades.*/ | Clubs/*->_empty_::Enums.Suits.Clubs.*/ => true
       case _              => false
 
@@ -49,7 +49,7 @@ object Enums/*<-_empty_::Enums.*/:
   object <:</*<-_empty_::Enums.`<:<`.*/ :
     given [T] as /*<-_empty_::Enums.`<:<`.given_T().*//*<-_empty_::Enums.`<:<`.given_T().[T]*/(T/*->_empty_::Enums.`<:<`.given_T().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.given_T().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.apply().*/()
 
-  extension [A/*<-_empty_::Enums.extension_unwrap().[A]*/, B/*<-_empty_::Enums.extension_unwrap().[B]*/](opt/*<-_empty_::Enums.extension_unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.extension_unwrap().[A]*/]) def unwrap(using ev:/*<-_empty_::Enums.extension_unwrap().*//*<-_empty_::Enums.extension_unwrap().(ev)*/ A/*->_empty_::Enums.extension_unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.extension_unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.extension_unwrap().[B]*/] = ev/*->_empty_::Enums.extension_unwrap().(ev)*/ match
+  extension [A/*<-_empty_::Enums.extension_unwrap().[A]*/, B/*<-_empty_::Enums.extension_unwrap().[B]*/](opt/*<-_empty_::Enums.extension_unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.extension_unwrap().[A]*/]) def unwrap/*<-_empty_::Enums.extension_unwrap().*/(using ev/*<-_empty_::Enums.extension_unwrap().(ev)*/: A/*->_empty_::Enums.extension_unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.extension_unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.extension_unwrap().[B]*/] = ev/*->_empty_::Enums.extension_unwrap().(ev)*/ match
     case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.extension_unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local0*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.extension_unwrap().[B]*/]])
 
   val some1/*<-_empty_::Enums.some1.*/ = /*->_empty_::Enums.extension_unwrap().*/Some/*->scala::Some.*//*->scala::Some.apply().*/(Some/*->scala::Some.*//*->scala::Some.apply().*/(1))/*->_empty_::Enums.`<:<`.given_T().*/.unwrap

tests/semanticdb/expect/Givens.expect.scala

@@ -4,23 +4,23 @@ package b
 object Givens/*<-a::b::Givens.*/:
 
   extension [A/*<-a::b::Givens.extension_sayHello().[A]*/](any/*<-a::b::Givens.extension_sayHello().(any)*/: A/*->a::b::Givens.extension_sayHello().[A]*/)
-    def sayHello = s"Hello/*<-a::b::Givens.extension_sayHello().*//*->scala::StringContext.apply().*/, I am $any/*->a::b::Givens.extension_sayHello().(any)*/"/*->scala::StringContext#s().*/
+    def sayHello/*<-a::b::Givens.extension_sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.extension_sayHello().(any)*/"/*->scala::StringContext#s().*/
 
   extension [B/*<-a::b::Givens.extension_sayGoodbye().[B]*//*<-a::b::Givens.extension_saySoLong().[B]*/](any/*<-a::b::Givens.extension_sayGoodbye().(any)*//*<-a::b::Givens.extension_saySoLong().(any)*/: B/*->a::b::Givens.extension_sayGoodbye().[B]*//*->a::b::Givens.extension_saySoLong().[B]*/)
-    def sayGoodbye = s"Goodb/*<-a::b::Givens.extension_sayGoodbye().*//*->scala::StringContext.apply().*/ye, from $any/*->a::b::Givens.extension_sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
-    def saySoLong = s"So Lo/*<-a::b::Givens.extension_saySoLong().*//*->scala::StringContext.apply().*/ng, from $any/*->a::b::Givens.extension_saySoLong().(any)*/"/*->scala::StringContext#s().*/
+    def sayGoodbye/*<-a::b::Givens.extension_sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.extension_sayGoodbye().(any)*/"/*->scala::StringContext#s().*/
+    def saySoLong/*<-a::b::Givens.extension_saySoLong().*/ = s"/*->scala::StringContext.apply().*/So Long, from $any/*->a::b::Givens.extension_saySoLong().(any)*/"/*->scala::StringContext#s().*/
 
   val hello1/*<-a::b::Givens.hello1.*/ = /*->a::b::Givens.extension_sayHello().*/1.sayHello
   val goodbye1/*<-a::b::Givens.goodbye1.*/ = /*->a::b::Givens.extension_sayGoodbye().*/1.sayGoodbye
   val soLong1/*<-a::b::Givens.soLong1.*/ = /*->a::b::Givens.extension_saySoLong().*/1.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]*/
-    extension (x/*<-a::b::Givens.Monoid#extension_combine().(x)*/: A/*->a::b::Givens.Monoid#[A]*/) def combine(y: A): A
-/*<-a::b::Givens.Monoid#extension_combine().*//*<-a::b::Givens.Monoid#extension_combine().(y)*//*->a::b::Givens.Monoid#[A]*//*->a::b::Givens.Monoid#[A]*/
+    extension (x/*<-a::b::Givens.Monoid#extension_combine().(x)*/: A/*->a::b::Givens.Monoid#[A]*/) def combine/*<-a::b::Givens.Monoid#extension_combine().*/(y/*<-a::b::Givens.Monoid#extension_combine().(y)*/: A/*->a::b::Givens.Monoid#[A]*/): A/*->a::b::Givens.Monoid#[A]*/
+
   given Monoid[String]:
    /*<-a::b::Givens.given_Monoid_String.*//*->a::b::Givens.Monoid#*//*->scala::Predef.String#*/ def empty/*<-a::b::Givens.given_Monoid_String.empty().*/ = ""
-    extension (x/*<-a::b::Givens.given_Monoid_String.extension_combine().(x)*/: String/*->scala::Predef.String#*/) def combine(y: String/*<-a::b::Givens.given_Monoid_String.extension_combine().*//*<-a::b::Givens.given_Monoid_String.extension_combine().(y)*//*->scala::Predef.String#*/) = x/*->a::b::Givens.given_Monoid_String.extension_combine().(x)*/ +/*->java::lang::String#`+`().*/ y/*->a::b::Givens.given_Monoid_String.extension_combine().(y)*/
+    extension (x/*<-a::b::Givens.given_Monoid_String.extension_combine().(x)*/: String/*->scala::Predef.String#*/) def combine/*<-a::b::Givens.given_Monoid_String.extension_combine().*/(y/*<-a::b::Givens.given_Monoid_String.extension_combine().(y)*/: String/*->scala::Predef.String#*/) = x/*->a::b::Givens.given_Monoid_String.extension_combine().(x)*/ +/*->java::lang::String#`+`().*/ y/*->a::b::Givens.given_Monoid_String.extension_combine().(y)*/
 
   inline given int2String/*<-a::b::Givens.int2String().*/ as Conversion/*->scala::Conversion#*/[Int/*->scala::Int#*/, String/*->scala::Predef.String#*/] = _.toString/*->scala::Any#toString().*/
 

tests/semanticdb/expect/toplevel.expect.scala

@@ -1,5 +1,5 @@
 inline val a = "/*<-_empty_::toplevel$package.*//*<-_empty_::toplevel$package.a.*/"
-extension (x/*<-_empty_::toplevel$package.extension_combine().(x)*/: Int/*->scala::Int#*/) def combine (y: Int) /*<-_empty_::toplevel$package.extension_combine().*//*<-_empty_::toplevel$package.extension_combine().(y)*//*->scala::Int#*/= x/*->_empty_::toplevel$package.extension_combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.extension_combine().(y)*/
+extension (x/*<-_empty_::toplevel$package.extension_combine().(x)*/: Int/*->scala::Int#*/) def combine/*<-_empty_::toplevel$package.extension_combine().*/ (y/*<-_empty_::toplevel$package.extension_combine().(y)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.extension_combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.extension_combine().(y)*/
 def combine/*<-_empty_::toplevel$package.combine().*/(x/*<-_empty_::toplevel$package.combine().(x)*/: Int/*->scala::Int#*/, y/*<-_empty_::toplevel$package.combine().(y)*/: Int/*->scala::Int#*/, z/*<-_empty_::toplevel$package.combine().(z)*/: Int/*->scala::Int#*/) = x/*->_empty_::toplevel$package.combine().(x)*/ +/*->scala::Int#`+`(+4).*/ y/*->_empty_::toplevel$package.combine().(y)*/ +/*->scala::Int#`+`(+4).*/ z/*->_empty_::toplevel$package.combine().(z)*/
 def combine/*<-_empty_::toplevel$package.combine(+1).*/ = 0
 def foo/*<-_empty_::toplevel$package.foo().*/ = "foo"

tests/semanticdb/metac.expect

@@ -855,7 +855,7 @@ Occurrences:
 [13:9..13:14): Suits <- _empty_/Enums.Suits.
 [14:15..14:19): suit <- _empty_/Enums.Suits.extension_isRed().(suit)
 [14:21..14:26): Suits -> _empty_/Enums.Suits#
-[14:32..14:47): isRed: Boolean  <- _empty_/Enums.Suits.extension_isRed().
+[14:32..14:37): isRed <- _empty_/Enums.Suits.extension_isRed().
 [14:39..14:46): Boolean -> scala/Boolean#
 [15:6..15:10): suit -> _empty_/Enums.Suits.extension_isRed().(suit)
 [15:11..15:13): == -> scala/Any#`==`().
@@ -866,7 +866,7 @@ Occurrences:
 [15:32..15:40): Diamonds -> _empty_/Enums.Suits.Diamonds.
 [17:15..17:19): suit <- _empty_/Enums.Suits.extension_isBlack().(suit)
 [17:21..17:26): Suits -> _empty_/Enums.Suits#
-[17:32..17:49): isBlack: Boolean  <- _empty_/Enums.Suits.extension_isBlack().
+[17:32..17:39): isBlack <- _empty_/Enums.Suits.extension_isBlack().
 [17:41..17:48): Boolean -> scala/Boolean#
 [17:51..17:55): suit -> _empty_/Enums.Suits.extension_isBlack().(suit)
 [18:11..18:17): Spades -> _empty_/Enums.Suits.Spades.
@@ -951,7 +951,7 @@ Occurrences:
 [51:19..51:22): opt <- _empty_/Enums.extension_unwrap().(opt)
 [51:24..51:30): Option -> scala/Option#
 [51:31..51:32): A -> _empty_/Enums.extension_unwrap().[A]
-[51:39..51:55): unwrap(using ev: <- _empty_/Enums.extension_unwrap().
+[51:39..51:45): unwrap <- _empty_/Enums.extension_unwrap().
 [51:52..51:54): ev <- _empty_/Enums.extension_unwrap().(ev)
 [51:56..51:57): A -> _empty_/Enums.extension_unwrap().[A]
 [51:58..51:61): <:< -> _empty_/Enums.`<:<`#
@@ -1274,7 +1274,7 @@ Occurrences:
 [5:13..5:14): A <- a/b/Givens.extension_sayHello().[A]
 [5:16..5:19): any <- a/b/Givens.extension_sayHello().(any)
 [5:21..5:22): A -> a/b/Givens.extension_sayHello().[A]
-[6:8..6:26): sayHello = s"Hello <- a/b/Givens.extension_sayHello().
+[6:8..6:16): sayHello <- a/b/Givens.extension_sayHello().
 [6:21..6:21): -> scala/StringContext.apply().
 [6:34..6:37): any -> a/b/Givens.extension_sayHello().(any)
 [6:37..6:38): " -> scala/StringContext#s().
@@ -1284,11 +1284,11 @@ Occurrences:
 [8:16..8:19): any <- a/b/Givens.extension_saySoLong().(any)
 [8:21..8:22): B -> a/b/Givens.extension_sayGoodbye().[B]
 [8:21..8:22): B -> a/b/Givens.extension_saySoLong().[B]
-[9:8..9:28): sayGoodbye = s"Goodb <- a/b/Givens.extension_sayGoodbye().
+[9:8..9:18): sayGoodbye <- a/b/Givens.extension_sayGoodbye().
 [9:23..9:23): -> scala/StringContext.apply().
 [9:38..9:41): any -> a/b/Givens.extension_sayGoodbye().(any)
 [9:41..9:42): " -> scala/StringContext#s().
-[10:8..10:27): saySoLong = s"So Lo <- a/b/Givens.extension_saySoLong().
+[10:8..10:17): saySoLong <- a/b/Givens.extension_saySoLong().
 [10:22..10:22): -> scala/StringContext.apply().
 [10:37..10:40): any -> a/b/Givens.extension_saySoLong().(any)
 [10:40..10:41): " -> scala/StringContext#s().
@@ -1305,7 +1305,7 @@ Occurrences:
 [17:15..17:16): A -> a/b/Givens.Monoid#[A]
 [18:15..18:16): x <- a/b/Givens.Monoid#extension_combine().(x)
 [18:18..18:19): A -> a/b/Givens.Monoid#[A]
-[18:25..19:0): <- a/b/Givens.Monoid#extension_combine().
+[18:25..18:32): combine <- a/b/Givens.Monoid#extension_combine().
 [18:33..18:34): y <- a/b/Givens.Monoid#extension_combine().(y)
 [18:36..18:37): A -> a/b/Givens.Monoid#[A]
 [18:40..18:41): A -> a/b/Givens.Monoid#[A]
@@ -1315,7 +1315,7 @@ Occurrences:
 [21:8..21:13): empty <- a/b/Givens.given_Monoid_String.empty().
 [22:15..22:16): x <- a/b/Givens.given_Monoid_String.extension_combine().(x)
 [22:18..22:24): String -> scala/Predef.String#
-[22:30..22:47): combine(y: String <- a/b/Givens.given_Monoid_String.extension_combine().
+[22:30..22:37): combine <- a/b/Givens.given_Monoid_String.extension_combine().
 [22:38..22:39): y <- a/b/Givens.given_Monoid_String.extension_combine().(y)
 [22:41..22:47): String -> scala/Predef.String#
 [22:51..22:52): x -> a/b/Givens.given_Monoid_String.extension_combine().(x)
@@ -3943,7 +3943,7 @@ Occurrences:
 [0:11..0:12): a <- _empty_/toplevel$package.a.
 [1:11..1:12): x <- _empty_/toplevel$package.extension_combine().(x)
 [1:14..1:17): Int -> scala/Int#
-[1:23..1:40): combine (y: Int)  <- _empty_/toplevel$package.extension_combine().
+[1:23..1:30): combine <- _empty_/toplevel$package.extension_combine().
 [1:32..1:33): y <- _empty_/toplevel$package.extension_combine().(y)
 [1:35..1:38): Int -> scala/Int#
 [1:42..1:43): x -> _empty_/toplevel$package.extension_combine().(x)