pass Tree in context, source->treeSource

Author: bishabosha

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

@@ -125,20 +125,20 @@ class ExtractSemanticDB extends Phase:
           if !excludeDef(tree.pid.symbol)
           && tree.pid.span.hasLength
             tree.pid match
-            case tree @ Select(qual, name) =>
-              registerDefinition(tree.symbol, adjustSpanToName(tree.span, qual.span, name, tree.source), Set.empty)
-              traverse(qual)
-            case tree => registerDefinition(tree.symbol, tree.span, Set.empty)
+            case tree: Select =>
+              registerDefinition(tree.symbol, selectSpan(tree), Set.empty, tree.source)
+              traverse(tree.qualifier)
+            case tree => registerDefinition(tree.symbol, tree.span, Set.empty, tree.source)
           tree.stats.foreach(traverse)
         case tree: NamedDefTree =>
           if tree.symbol.isAllOf(ModuleValCreationFlags)
             return
           if !excludeDef(tree.symbol)
           && tree.span.hasLength
-            registerDefinition(tree.symbol, tree.adjustedNameSpan, symbolKinds(tree))
+            registerDefinition(tree.symbol, tree.adjustedNameSpan, symbolKinds(tree), tree.source)
             val privateWithin = tree.symbol.privateWithin
             if privateWithin.exists
-              registerUseGuarded(None, privateWithin, spanOfSymbol(privateWithin, tree.span))
+              registerUseGuarded(None, privateWithin, spanOfSymbol(privateWithin, tree.span, tree.source), tree.source)
           else if !excludeSymbol(tree.symbol)
             registerSymbol(tree.symbol, symbolName(tree.symbol), symbolKinds(tree))
           tree match
@@ -176,7 +176,7 @@ class ExtractSemanticDB extends Phase:
           val ctorSym = tree.constr.symbol
           if !excludeDef(ctorSym)
             traverseAnnotsOfDefinition(ctorSym)
-            registerDefinition(ctorSym, tree.constr.span, Set.empty)
+            registerDefinition(ctorSym, tree.constr.span, Set.empty, tree.source)
             ctorParams(tree.constr.vparamss, tree.body)
           for parent <- tree.parentsOrDerived if parent.span.hasLength do
             traverse(parent)
@@ -192,39 +192,40 @@ class ExtractSemanticDB extends Phase:
           traverse(tree.fun)
           for arg <- tree.args do
             arg match
-              case arg @ NamedArg(name, value) =>
-                registerUse(genParamSymbol(name), arg.span.startPos.withEnd(arg.span.start + name.toString.length))
-                traverse(localBodies.get(value.symbol).getOrElse(value))
+              case tree @ NamedArg(name, arg) =>
+                registerUse(genParamSymbol(name), tree.span.startPos.withEnd(tree.span.start + name.toString.length), tree.source)
+                traverse(localBodies.get(arg.symbol).getOrElse(arg))
               case _ => traverse(arg)
         case tree: Assign =>
           val qualSym = condOpt(tree.lhs) { case Select(qual, _) if qual.symbol.exists => qual.symbol }
           if !excludeUse(qualSym, tree.lhs.symbol)
             val lhs = tree.lhs.symbol
             val setter = lhs.matchingSetter.orElse(lhs)
             tree.lhs match
-              case tree @ Select(qual, name) => registerUse(setter, adjustSpanToName(tree.span, qual.span, name, tree.source))
-              case tree                      => registerUse(setter, tree.span)
+              case tree: Select => registerUse(setter, selectSpan(tree), tree.source)
+              case tree         => registerUse(setter, tree.span, tree.source)
             traverseChildren(tree.lhs)
           traverse(tree.rhs)
         case tree: Ident =>
           if tree.name != nme.WILDCARD then
             val sym = tree.symbol.adjustIfCtorTyparam
-            registerUseGuarded(None, sym, tree.span)
+            registerUseGuarded(None, sym, tree.span, tree.source)
         case tree: Select =>
-          val qualSpan = tree.qualifier.span
+          val qual = tree.qualifier
+          val qualSpan = qual.span
           val sym = tree.symbol.adjustIfCtorTyparam
-          registerUseGuarded(tree.qualifier.symbol.ifExists, sym, adjustSpanToName(tree.span, qualSpan, tree.name, tree.source))
+          registerUseGuarded(qual.symbol.ifExists, sym, selectSpan(tree), tree.source)
           if qualSpan.exists && qualSpan.hasLength then
-            traverse(tree.qualifier)
+            traverse(qual)
         case tree: Import =>
           if tree.span.exists && tree.span.hasLength then
             for sel <- tree.selectors do
               val imported = sel.imported.name
               if imported != nme.WILDCARD then
                 for alt <- tree.expr.tpe.member(imported).alternatives do
-                  registerUseGuarded(None, alt.symbol, sel.imported.span)
+                  registerUseGuarded(None, alt.symbol, sel.imported.span, tree.source)
                   if (alt.symbol.companionClass.exists)
-                    registerUseGuarded(None, alt.symbol.companionClass, sel.imported.span)
+                    registerUseGuarded(None, alt.symbol.companionClass, sel.imported.span, tree.source)
             traverseChildren(tree)
         case tree: Inlined =>
           traverse(tree.call)
@@ -334,18 +335,23 @@ class ExtractSemanticDB extends Phase:
        *  the same starting position have the same index.
        */
       def localIdx(sym: Symbol)(using Context): Int =
-        def startPos(sym: Symbol) =
-          if sym.span.exists then sym.span.start else -1
-        def computeLocalIdx(): Int =
-          symsAtOffset(startPos(sym)).find(_.name == sym.name) match
-            case Some(other) => localIdx(other)
+        val startPos =
+          assert(sym.span.exists, s"$sym should have a span")
+          sym.span.start
+        @tailrec
+        def computeLocalIdx(sym: Symbol): Int = locals get sym match
+          case Some(idx) => idx
+          case None      => symsAtOffset(startPos).find(_.name == sym.name) match
+            case Some(other) => computeLocalIdx(other)
             case None =>
               val idx = nextLocalIdx
               nextLocalIdx += 1
               locals(sym) = idx
-              symsAtOffset(startPos(sym)) += sym
+              symsAtOffset(startPos) += sym
               idx
-        locals.getOrElseUpdate(sym, computeLocalIdx())
+        end computeLocalIdx
+        computeLocalIdx(sym)
+      end localIdx
 
       if sym.exists then
         if sym.isGlobal then
@@ -361,10 +367,8 @@ class ExtractSemanticDB extends Phase:
       addSymName(b, sym)
       b.toString
 
-    inline private def source(using Context) = ctx.compilationUnit.source
-
-    private def range(span: Span)(using Context): Option[Range] =
-      def lineCol(offset: Int) = (source.offsetToLine(offset), source.column(offset))
+    private def range(span: Span, treeSource: SourceFile)(using Context): Option[Range] =
+      def lineCol(offset: Int) = (treeSource.offsetToLine(offset), treeSource.column(offset))
       val (startLine, startCol) = lineCol(span.start)
       val (endLine, endCol) = lineCol(span.end)
       Some(Range(startLine, startCol, endLine, endCol))
@@ -456,30 +460,30 @@ class ExtractSemanticDB extends Phase:
     private def registerSymbolSimple(sym: Symbol)(using Context): Unit =
       registerSymbol(sym, symbolName(sym), Set.empty)
 
-    private def registerOccurrence(symbol: String, span: Span, role: SymbolOccurrence.Role)(using Context): Unit =
-      val occ = SymbolOccurrence(symbol, range(span), role)
+    private def registerOccurrence(symbol: String, span: Span, role: SymbolOccurrence.Role, treeSource: SourceFile)(using Context): Unit =
+      val occ = SymbolOccurrence(symbol, range(span, treeSource), role)
       if !generated.contains(occ) && occ.symbol.nonEmpty then
         occurrences += occ
         generated += occ
 
-    private def registerUseGuarded(qualSym: Option[Symbol], sym: Symbol, span: Span)(using Context) =
+    private def registerUseGuarded(qualSym: Option[Symbol], sym: Symbol, span: Span, treeSource: SourceFile)(using Context) =
       if !excludeUse(qualSym, sym) then
-        registerUse(sym, span)
+        registerUse(sym, span, treeSource)
 
-    private def registerUse(sym: Symbol, span: Span)(using Context): Unit =
-      registerUse(symbolName(sym), span)
+    private def registerUse(sym: Symbol, span: Span, treeSource: SourceFile)(using Context): Unit =
+      registerUse(symbolName(sym), span, treeSource)
 
-    private def registerUse(symbol: String, span: Span)(using Context): Unit =
-      registerOccurrence(symbol, span, SymbolOccurrence.Role.REFERENCE)
+    private def registerUse(symbol: String, span: Span, treeSource: SourceFile)(using Context): Unit =
+      registerOccurrence(symbol, span, SymbolOccurrence.Role.REFERENCE, treeSource)
 
-    private def registerDefinition(sym: Symbol, span: Span, symkinds: Set[SymbolKind])(using Context) =
+    private def registerDefinition(sym: Symbol, span: Span, symkinds: Set[SymbolKind], treeSource: SourceFile)(using Context) =
       val symbol = symbolName(sym)
-      registerOccurrence(symbol, span, SymbolOccurrence.Role.DEFINITION)
+      registerOccurrence(symbol, span, SymbolOccurrence.Role.DEFINITION, treeSource)
       if !sym.is(Package)
         registerSymbol(sym, symbol, symkinds)
 
-    private def spanOfSymbol(sym: Symbol, span: Span)(using Context): Span =
-      val contents = if source.exists then source.content() else Array.empty[Char]
+    private def spanOfSymbol(sym: Symbol, span: Span, treeSource: SourceFile)(using Context): Span =
+      val contents = if treeSource.exists then treeSource.content() else Array.empty[Char]
       val idx = contents.indexOfSlice(sym.name.show, span.start)
       val start = if idx >= 0 then idx else span.start
       Span(start, start + sym.name.show.length, start)
@@ -503,13 +507,13 @@ class ExtractSemanticDB extends Phase:
         }).toMap
     end findGetters
 
-    private def adjustSpanToName(span: Span, qualSpan: Span, name: Name, source: SourceFile) =
-      val end = span.end
-      val limit = qualSpan.end
+    private def selectSpan(tree: Select) =
+      val end = tree.span.end
+      val limit = tree.qualifier.span.end
       val start =
         if limit < end then
-          val len = name.toString.length
-          if source.content()(end - 1) == '`' then end - len - 2 else end - len
+          val len = tree.name.toString.length
+          if tree.source.content()(end - 1) == '`' then end - len - 2 else end - len
         else limit
       Span(start max limit, end)
 

tests/semanticdb/expect/MethodUsages.expect.scala

@@ -29,10 +29,8 @@ class MethodUsages/*<-example::MethodUsages#*/ {
   m/*->example::MethodUsages#m.*/.m18/*->example::Methods#m18.*/.m/*->example::Methods#m17.m().*/()
   m/*->example::MethodUsages#m.*/.m18/*->example::Methods#m18().*/(1)
   m/*->example::MethodUsages#m.*/.m18/*->example::Methods#m18(+1).*/("")
-}
-
-object MethodUsages/*<-example::MethodUsages.*/ {
-  var x/*<-example::MethodUsages.x().*/: Int/*->scala::Int#*/ = 1
-  def x/*<-example::MethodUsages.x(+1).*/(n/*<-example::MethodUsages.x(+1).(n)*/: String/*->scala::Predef.String#*/): Int/*->scala::Int#*/ = /*->scala::Predef.augmentString().*/n/*->example::MethodUsages.x(+1).(n)*/.toInt/*->scala::collection::StringOps#toInt().*/
-  def foo/*<-example::MethodUsages.foo().*/: Int/*->scala::Int#*/ = x/*->example::MethodUsages.x().*/ +/*->scala::Int#`+`(+4).*/ x/*->example::MethodUsages.x(+1).*/("22")
+  m/*->example::MethodUsages#m.*/.m19/*->example::Methods#m19().*/(1,2)(3)
+  m/*->example::MethodUsages#m.*/.m20/*->example::Methods#m20().*/(1)
+  m/*->example::MethodUsages#m.*/.m20/*->example::Methods#m20(+1).*/("")
+  m/*->example::MethodUsages#m.*/.m20/*->example::Methods#m20(+2).*/.m/*->example::Methods#m17.m().*/()
 }

tests/semanticdb/expect/MethodUsages.scala

@@ -29,10 +29,8 @@ class MethodUsages {
   m.m18.m()
   m.m18(1)
   m.m18("")
-}
-
-object MethodUsages {
-  var x: Int = 1
-  def x(n: String): Int = n.toInt
-  def foo: Int = x + x("22")
+  m.m19(1,2)(3)
+  m.m20(1)
+  m.m20("")
+  m.m20.m()
 }

tests/semanticdb/expect/Methods.expect.scala

@@ -34,4 +34,7 @@ class Methods/*<-example::Methods#*/[T/*<-example::Methods#[T]*/] {
   def m18/*<-example::Methods#m18().*/(a/*<-example::Methods#m18().(a)*/: Int/*->scala::Int#*/) = ???/*->scala::Predef.`???`().*/
   def m18/*<-example::Methods#m18(+1).*/(b/*<-example::Methods#m18(+1).(b)*/: String/*->scala::Predef.String#*/) = ???/*->scala::Predef.`???`().*/
   def m19/*<-example::Methods#m19().*/(x/*<-example::Methods#m19().(x)*//*<-example::Methods#m19$default$3().(x)*/: Int/*->scala::Int#*/, y/*<-example::Methods#m19().(y)*//*<-example::Methods#m19$default$3().(y)*/: Int/*->scala::Int#*/ = 2)(z/*<-example::Methods#m19().(z)*/: Int/*->scala::Int#*/ = 3) = ???/*->scala::Predef.`???`().*/
+  def m20/*<-example::Methods#m20().*/(a/*<-example::Methods#m20().(a)*/: Int/*->scala::Int#*/) = ???/*->scala::Predef.`???`().*/
+  def m20/*<-example::Methods#m20(+1).*/(b/*<-example::Methods#m20(+1).(b)*/: String/*->scala::Predef.String#*/) = ???/*->scala::Predef.`???`().*/
+  var m20/*<-example::Methods#m20(+2).*/ = m17/*->example::Methods#m17.*/
 }

tests/semanticdb/expect/Methods.scala

@@ -34,4 +34,7 @@ class Methods[T] {
   def m18(a: Int) = ???
   def m18(b: String) = ???
   def m19(x: Int, y: Int = 2)(z: Int = 3) = ???
+  def m20(a: Int) = ???
+  def m20(b: String) = ???
+  var m20 = m17
 }

tests/semanticdb/metac.expect

@@ -1707,20 +1707,13 @@ Schema => SemanticDB v4
 Uri => MethodUsages.scala
 Text => empty
 Language => Scala
-Symbols => 10 entries
-Occurrences => 91 entries
+Symbols => 3 entries
+Occurrences => 85 entries
 
 Symbols:
 example/MethodUsages# => class MethodUsages
 example/MethodUsages#`<init>`(). => primary ctor <init>
 example/MethodUsages#m. => val method m
-example/MethodUsages. => final object MethodUsages
-example/MethodUsages.`x_=`(). => var method x_=
-example/MethodUsages.`x_=`().(x$1) => param x$1
-example/MethodUsages.foo(). => method foo
-example/MethodUsages.x(). => var method x
-example/MethodUsages.x(+1). => method x
-example/MethodUsages.x(+1).(n) => param n
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -1799,21 +1792,15 @@ Occurrences:
 [29:4..29:7): m18 -> example/Methods#m18().
 [30:2..30:3): m -> example/MethodUsages#m.
 [30:4..30:7): m18 -> example/Methods#m18(+1).
-[33:7..33:19): MethodUsages <- example/MethodUsages.
-[34:6..34:7): x <- example/MethodUsages.x().
-[34:9..34:12): Int -> scala/Int#
-[35:6..35:7): x <- example/MethodUsages.x(+1).
-[35:8..35:9): n <- example/MethodUsages.x(+1).(n)
-[35:11..35:17): String -> scala/Predef.String#
-[35:20..35:23): Int -> scala/Int#
-[35:26..35:26): -> scala/Predef.augmentString().
-[35:26..35:27): n -> example/MethodUsages.x(+1).(n)
-[35:28..35:33): toInt -> scala/collection/StringOps#toInt().
-[36:6..36:9): foo <- example/MethodUsages.foo().
-[36:11..36:14): Int -> scala/Int#
-[36:17..36:18): x -> example/MethodUsages.x().
-[36:19..36:20): + -> scala/Int#`+`(+4).
-[36:21..36:22): x -> example/MethodUsages.x(+1).
+[31:2..31:3): m -> example/MethodUsages#m.
+[31:4..31:7): m19 -> example/Methods#m19().
+[32:2..32:3): m -> example/MethodUsages#m.
+[32:4..32:7): m20 -> example/Methods#m20().
+[33:2..33:3): m -> example/MethodUsages#m.
+[33:4..33:7): m20 -> example/Methods#m20(+1).
+[34:2..34:3): m -> example/MethodUsages#m.
+[34:4..34:7): m20 -> example/Methods#m20(+2).
+[34:8..34:9): m -> example/Methods#m17.m().
 
 expect/Methods.scala
 --------------------
@@ -1823,8 +1810,8 @@ Schema => SemanticDB v4
 Uri => Methods.scala
 Text => empty
 Language => Scala
-Symbols => 70 entries
-Occurrences => 139 entries
+Symbols => 77 entries
+Occurrences => 149 entries
 
 Symbols:
 example/Methods# => class Methods
@@ -1838,6 +1825,8 @@ example/Methods#`<init>`(). => primary ctor <init>
 example/Methods#`m8().`(). => method m8().
 example/Methods#`m9().`# => class m9().
 example/Methods#`m9().`#`<init>`(). => primary ctor <init>
+example/Methods#`m20_=`(). => var method m20_=
+example/Methods#`m20_=`().(x$1) => param x$1
 example/Methods#m1(). => method m1
 example/Methods#m2(). => method m2
 example/Methods#m3(). => method m3
@@ -1896,6 +1885,11 @@ example/Methods#m19(). => method m19
 example/Methods#m19().(x) => param x
 example/Methods#m19().(y) => param y
 example/Methods#m19().(z) => param z
+example/Methods#m20(). => method m20
+example/Methods#m20().(a) => param a
+example/Methods#m20(+1). => method m20
+example/Methods#m20(+1).(b) => param b
+example/Methods#m20(+2). => var method m20
 local0 => abstract val method x
 
 Occurrences:
@@ -2038,6 +2032,16 @@ Occurrences:
 [35:30..35:31): z <- example/Methods#m19().(z)
 [35:33..35:36): Int -> scala/Int#
 [35:44..35:47): ??? -> scala/Predef.`???`().
+[36:6..36:9): m20 <- example/Methods#m20().
+[36:10..36:11): a <- example/Methods#m20().(a)
+[36:13..36:16): Int -> scala/Int#
+[36:20..36:23): ??? -> scala/Predef.`???`().
+[37:6..37:9): m20 <- example/Methods#m20(+1).
+[37:10..37:11): b <- example/Methods#m20(+1).(b)
+[37:13..37:19): String -> scala/Predef.String#
+[37:23..37:26): ??? -> scala/Predef.`???`().
+[38:6..38:9): m20 <- example/Methods#m20(+2).
+[38:12..38:15): m17 -> example/Methods#m17.
 
 expect/NamedApplyBlock.scala
 ----------------------------