produce SDB of var reassigning

Author: Matthieu

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

@@ -62,6 +62,7 @@ import dotty.tools.dotc.semanticdb.Scala3.TastyFakeSymbol
 
 
 import dotty.tools.dotc.SDBSymbolNameBuilder
+import dotty.tools.dotc.core.StdNames.str
 
 extension (sym : Symbol){
 
@@ -292,16 +293,24 @@ class CustomTreeTraverser(sourceFilePath: String)(using ctx: Context)(using SDBS
     val sname = sym.SDBname
     registerSymbol(sym, symkinds)
 
-  private def registerOccurrence(symbol: Symbol, span: SourcePosition, role: SymbolOccurrence.Role)(using Context, SDBSymbolNameBuilder): Unit =
-    val range = if span.isUnknown then None else
-      val result = extractor.extract(symbol.name.toString(), span, symbol)
-      Some(result)
-
+  private def registerOccurrence(symbol: Symbol, range: Option[dotty.tools.dotc.semanticdb.Range], role: SymbolOccurrence.Role)(using Context, SDBSymbolNameBuilder): Unit =
     val occ = SymbolOccurrence(range, symbol.SDBname, role)
     if !generated.contains(occ) && occ.symbol.nonEmpty && !range.isEmpty then
       occurrences += occ
       generated += occ
+
+  private def registerOccurrence(symbol: Symbol, span: SourcePosition, role: SymbolOccurrence.Role)(using Context, SDBSymbolNameBuilder): Unit =
+    val range = if span.isUnknown then None else
+      val result = extractor.extract(symbol.name.toString(), span, symbol)
+      Some(result)
+    registerOccurrence(symbol, range, role)
+  
+  private def registerOccurrence(symbol: Symbol, otherSymbol: Symbol, otherSymbolSpan: SourcePosition, role: SymbolOccurrence.Role)(using Context, SDBSymbolNameBuilder): Unit =
+    val range = if otherSymbolSpan.isUnknown then None else
+      val result = extractor.extract(otherSymbol.name.toString(), otherSymbolSpan, otherSymbol)
+      Some(result)
 
+    registerOccurrence(symbol, range, role)
 
   private def registerOccurrence(symbol: Symbol, symbolName: String, span: SourcePosition, role: SymbolOccurrence.Role)(using Context, SDBSymbolNameBuilder): Unit =
     val range = if span.isUnknown then None else
@@ -392,13 +401,21 @@ class CustomTreeTraverser(sourceFilePath: String)(using ctx: Context)(using SDBS
       case assign : Assign =>
         assign.lhs match
           case select : Select => 
-            registerOccurrence(select.symbol, select.pos, dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.REFERENCE)
+            val setterName = select.symbol.name.toTermName match
+              case simpleName : SimpleName => simpleName.append(str.SETTER_SUFFIX)
+              case _ => select.symbol.name.toTermName
+            
+            val found = select.symbol.owner match
+              case classSymbol: ClassSymbol =>
+                classSymbol.declarations.find(_.name == setterName).getOrElse(select.symbol)
+              case _ => select.symbol
+
+            registerOccurrence(found, select.symbol, select.pos, dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.REFERENCE)
             super.traverse(assign.rhs)
           case _ => super.traverse(tree)
 
 
       case ident: Ident=> 
-          
         registerOccurrence(ident.symbol, ident.pos, dotty.tools.dotc.semanticdb.SymbolOccurrence.Role.REFERENCE)
         super.traverse(tree)
 

tests/semanticdb/expect/TastyQueryVar.expect.scala

@@ -1,8 +1,10 @@
 class TastyQueryVar/*<-_empty_::TastyQueryVar#*/{
-    var v/*<-_empty_::TastyQueryVar#v().*/ = 1
-    val x/*<-_empty_::TastyQueryVar#x.*/ = v/*->_empty_::TastyQueryVar#v().*/
-    def foo/*<-_empty_::TastyQueryVar#foo().*/(x/*<-_empty_::TastyQueryVar#foo().(x)*/ : Int/*->scala::Int#*/) = {
-        var z/*<-local0*/ = "Hello"
-    }
+    var x/*<-_empty_::TastyQueryVar#x().*/ = 2
+    x/*->_empty_::TastyQueryVar#`x_=`().*/ = 3
 
+    def foo/*<-_empty_::TastyQueryVar#foo().*/ =
+        var z/*<-local0*/ = 2
+        z/*->local0*/ = 3
+    var p/*<-_empty_::TastyQueryVar#p().*/ = foo/*->_empty_::TastyQueryVar#foo().*/
+    p/*->_empty_::TastyQueryVar#`p_=`().*/ = {val x/*<-local1*/ = true}
 }

tests/semanticdb/expect/TastyQueryVar.scala

@@ -1,9 +1,10 @@
 class TastyQueryVar{
-    var v = 1
-    val x = v
-    
-    def foo(x : Int) = {
-        var z = "Hello"
-    }
+    var x = 2
+    x = 3
 
+    def foo = 
+        var x = 2
+        x = 3
+    var p = foo
+    p = {val x = true}
 }

tests/semanticdb/metac.expect

@@ -4315,34 +4315,38 @@ Schema => SemanticDB v4
 Uri => TastyQueryVar.scala
 Text => empty
 Language => Scala
-Symbols => 9 entries
-Occurrences => 9 entries
+Symbols => 11 entries
+Occurrences => 11 entries
 Diagnostics => 1 entries
 
 Symbols:
-_empty_/TastyQueryVar# => class TastyQueryVar extends Object { self: TastyQueryVar => +5 decls }
+_empty_/TastyQueryVar# => class TastyQueryVar extends Object { self: TastyQueryVar => +6 decls }
 _empty_/TastyQueryVar#`<init>`(). => primary ctor <init> (): TastyQueryVar
-_empty_/TastyQueryVar#`v_=`(). => var method v_= (param x$1: Int): Unit
-_empty_/TastyQueryVar#`v_=`().(x$1) => param x$1: Int
-_empty_/TastyQueryVar#foo(). => method foo (param x: Int): Unit
-_empty_/TastyQueryVar#foo().(x) => param x: Int
-_empty_/TastyQueryVar#v(). => var method v Int
-_empty_/TastyQueryVar#x. => val method x Int
-local0 => var local z: String
+_empty_/TastyQueryVar#`p_=`(). => var method p_= (param x$1: Unit): Unit
+_empty_/TastyQueryVar#`p_=`().(x$1) => param x$1: Unit
+_empty_/TastyQueryVar#`x_=`(). => var method x_= (param x$1: Int): Unit
+_empty_/TastyQueryVar#`x_=`().(x$1) => param x$1: Int
+_empty_/TastyQueryVar#foo(). => method foo => Unit
+_empty_/TastyQueryVar#p(). => var method p Unit
+_empty_/TastyQueryVar#x(). => var method x Int
+local0 => var local z: Int
+local1 => val local x: Boolean
 
 Occurrences:
 [0:6..0:19): TastyQueryVar <- _empty_/TastyQueryVar#
 [1:4..1:4): <- _empty_/TastyQueryVar#`<init>`().
-[1:8..1:9): v <- _empty_/TastyQueryVar#v().
-[2:8..2:9): x <- _empty_/TastyQueryVar#x.
-[2:12..2:13): v -> _empty_/TastyQueryVar#v().
-[3:8..3:11): foo <- _empty_/TastyQueryVar#foo().
-[3:12..3:13): x <- _empty_/TastyQueryVar#foo().(x)
-[3:16..3:19): Int -> scala/Int#
-[4:12..4:13): z <- local0
+[1:8..1:9): x <- _empty_/TastyQueryVar#x().
+[2:4..2:5): x -> _empty_/TastyQueryVar#`x_=`().
+[4:8..4:11): foo <- _empty_/TastyQueryVar#foo().
+[5:12..5:13): z <- local0
+[6:8..6:9): z -> local0
+[7:8..7:9): p <- _empty_/TastyQueryVar#p().
+[7:12..7:15): foo -> _empty_/TastyQueryVar#foo().
+[8:4..8:5): p -> _empty_/TastyQueryVar#`p_=`().
+[8:13..8:14): x <- local1
 
 Diagnostics:
-[4:12..4:13): [warning] unused local definition
+[8:13..8:14): [warning] unused local definition
 
 expect/TastyQueryVariousFeatures.scala
 --------------------------------------