adjust extension method name in nameSpan

Author: bishabosha

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

@@ -337,13 +337,16 @@ object Trees {
      *  a calling chain from `viewExists`), in that case the return position is NoSpan.
      *  Overridden in Bind
      */
-    def nameSpan: Span =
+    def nameSpan(using Context): Span =
       if (span.exists) {
         val point = span.point
         if (rawMods.is(Synthetic) || span.isSynthetic || name.toTermName == nme.ERROR) Span(point)
         else {
           val realName = name.stripModuleClassSuffix.lastPart
-          Span(point, point + realName.length, point)
+          var length = realName.length
+          if symbol.is(ExtensionMethod) && name.isExtensionName then
+            length -= "extension_".length
+          Span(point, point + length, point)
         }
       }
       else span
@@ -352,7 +355,7 @@ object Trees {
      *  This is a point position if the definition is synthetic, or a range position
      *  if the definition comes from source.
      */
-    def namePos: SourcePosition = source.atSpan(nameSpan)
+    def namePos(using Context): SourcePosition = source.atSpan(nameSpan)
   }
 
   /** Tree defines a new symbol and carries modifiers.
@@ -711,7 +714,7 @@ object Trees {
     override def isType: Boolean = name.isTypeName
     override def isTerm: Boolean = name.isTermName
 
-    override def nameSpan: Span =
+    override def nameSpan(using Context): Span =
       if span.exists then Span(span.start, span.start + name.toString.length) else span
   }
 

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.adjustedNameSpan, symbolKinds(tree), tree.source)
+            registerDefinition(tree.symbol, tree.nameSpan, 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,14 +283,6 @@ class ExtractSemanticDB extends Phase:
 
     end PatternValDef
 
-    extension (tree: NamedDefTree):
-      private def adjustedNameSpan(using Context): Span =
-        val nameSpan = tree.nameSpan
-        if tree.symbol.is(ExtensionMethod) && tree.name.isExtensionName then
-          nameSpan.withEnd(nameSpan.end - ExtractSemanticDB.extensionPrefixLength)
-        else
-          nameSpan
-
     /** Add semanticdb name of the given symbol to string builder */
     private def addSymName(b: StringBuilder, sym: Symbol)(using Context): Unit =
 
@@ -599,8 +591,6 @@ 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 =