better properties for symbols

Author: bishabosha

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

@@ -42,7 +42,7 @@ class ExtractSemanticDB extends Phase with
     val unit = ctx.compilationUnit
     val extract = Extractor()
     extract.traverse(unit.tpdTree)
-    ExtractSemanticDB.write(unit.source, extract.occurrences.toList, extract.symbols.toList)
+    ExtractSemanticDB.write(unit.source, extract.occurrences.toList, extract.symbolInfos.toList)
 
   /** Extractor of symbol occurrences from trees */
   class Extractor extends TreeTraverser with
@@ -60,7 +60,10 @@ class ExtractSemanticDB extends Phase with
     val occurrences = new mutable.ListBuffer[SymbolOccurrence]()
 
     /** The extracted symbol infos */
-    val symbols = new mutable.HashSet[SymbolInformation]()
+    val symbolInfos = new mutable.HashSet[SymbolInformation]()
+
+    /** A cache of localN names */
+    val localNames = new mutable.HashSet[String]()
 
     /** The symbol occurrences generated so far, as a set */
     private val generated = new mutable.HashSet[SymbolOccurrence]
@@ -76,7 +79,7 @@ class ExtractSemanticDB extends Phase with
         if isJavaIdent(str) then b append str
         else b append '`' append str append '`'
 
-      /** Is symbol global? Non-global symbols get localX names */
+      /** Is symbol global? Non-global symbols get localNå names */
       def isGlobal(sym: Symbol): Boolean =
         sym.is(Package)
         || !sym.isSelfSym && (sym.is(Param) || sym.owner.isClass) && isGlobal(sym.owner)
@@ -265,7 +268,11 @@ class ExtractSemanticDB extends Phase with
       )
 
     private def registerSymbol(sym: Symbol, symbolName: String, symkinds: Set[SymbolKind])(given Context): Unit =
-      symbols += symbolInfo(sym, symbolName, symkinds)
+      val isLocal = symbolName.isLocal
+      if !isLocal || !localNames.contains(symbolName)
+        if isLocal
+          localNames += symbolName
+        symbolInfos += symbolInfo(sym, symbolName, symkinds)
 
     private def registerOccurrence(symbol: String, span: Span, role: SymbolOccurrence.Role)(given Context): Unit =
       val occ = SymbolOccurrence(symbol, range(span), role)
@@ -351,7 +358,7 @@ class ExtractSemanticDB extends Phase with
         val symkinds = mutable.HashSet.empty[SymbolKind]
         tree match
         case tree: ValDef =>
-          if !tree.symbol.owner.is(Method)
+          if !tree.symbol.is(Param)
             symkinds += (if tree.mods is Mutable then SymbolKind.Var else SymbolKind.Val)
           if tree.rhs.isEmpty && !tree.symbol.isOneOf(TermParam | CaseAccessor | ParamAccessor)
             symkinds += SymbolKind.Abstract
@@ -360,7 +367,8 @@ class ExtractSemanticDB extends Phase with
             symkinds += SymbolKind.Setter
           else if tree.rhs.isEmpty
             symkinds += SymbolKind.Abstract
-        case tree: Bind => symkinds += SymbolKind.Val
+        case tree: Bind =>
+          symkinds += SymbolKind.Val
         case _ =>
         symkinds.toSet
 
@@ -493,7 +501,7 @@ object ExtractSemanticDB with
 
   val name: String = "extractSemanticDB"
 
-  def write(source: SourceFile, occurrences: List[SymbolOccurrence], symbols: List[SymbolInformation])(given ctx: Context): Unit =
+  def write(source: SourceFile, occurrences: List[SymbolOccurrence], symbolInfos: List[SymbolInformation])(given ctx: Context): Unit =
     def absolutePath(path: Path): Path = path.toAbsolutePath.normalize
     val sourcePath = absolutePath(source.file.jpath)
     val sourceRoot = absolutePath(Paths.get(ctx.settings.sourceroot.value))
@@ -516,7 +524,7 @@ object ExtractSemanticDB with
       uri = relPath.toString,
       text = "",
       md5 = internal.MD5.compute(String(source.content)),
-      symbols = symbols,
+      symbols = symbolInfos,
       occurrences = occurrences
     )
     val docs = TextDocuments(List(doc))

tests/semanticdb/metac.expect

@@ -219,7 +219,7 @@ annot/M.m().[TT] => typeparam TT
 annot/T# => trait T
 annot/T#`<init>`(). => primary ctor <init>
 local0 => selfparam self
-local1 => local local
+local1 => val local local
 
 Occurrences:
 [0:8..0:13): annot <- annot/
@@ -412,7 +412,7 @@ classes/N.anonFun. => val method anonFun
 local0 => primary ctor <init>
 local1 => val method local
 local2 => param i
-local3 => local local
+local3 => val local local
 
 Occurrences:
 [0:8..0:15): classes <- classes/
@@ -1125,16 +1125,14 @@ Schema => SemanticDB v4
 Uri => ForComprehension.scala
 Text => empty
 Language => Scala
-Symbols => 16 entries
+Symbols => 13 entries
 Occurrences => 72 entries
 
 Symbols:
 example/ForComprehension# => class ForComprehension
 example/ForComprehension#`<init>`(). => primary ctor <init>
 local0 => param a
-local1 => val local b
 local1 => param b
-local2 => local c
 local2 => val local c
 local3 => param x$1
 local4 => param a
@@ -1143,7 +1141,6 @@ local6 => param x$1
 local7 => val local c
 local8 => val local d
 local9 => val local e
-local9 => local e
 local10 => param f
 
 Occurrences:
@@ -2089,9 +2086,9 @@ example/NamedApplyBlockMethods.foo().(b) => param b
 example/NamedApplyBlockMethods.foo().(c) => param c
 example/NamedApplyBlockMethods.local. => val method local
 example/NamedApplyBlockMethods.recursive(). => method recursive
-local0 => local b$1
-local1 => local c$1
-local2 => local b$3
+local0 => val local b$1
+local1 => val local c$1
+local2 => val local b$3
 local3 => val local head$1
 
 Occurrences:
@@ -3018,7 +3015,7 @@ Schema => SemanticDB v4
 Uri => ValPattern.scala
 Text => empty
 Language => Scala
-Symbols => 25 entries
+Symbols => 23 entries
 Occurrences => 57 entries
 
 Symbols:
@@ -3039,14 +3036,12 @@ example/ValPattern#right. => val method right
 example/ValPattern#rightVar(). => var method rightVar
 local0 => val local number1
 local1 => val local number1Var
-local2 => local left
-local3 => local right
-local4 => local number1
+local2 => val local left
+local3 => val local right
 local4 => val local number1
-local5 => local leftVar
-local6 => local rightVar
-local7 => local number1Var
-local7 => val local number1Var
+local5 => var local leftVar
+local6 => var local rightVar
+local7 => var local number1Var
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -3152,11 +3147,11 @@ example/Vals#yim(). => implicit var method yim
 example/Vals#ylm(). => var method ylm
 example/Vals#ym(). => var method ym
 example/Vals#yp(). => var method yp
-local0 => local xl
-local1 => lazy local xzl
-local2 => implicit local xil
-local3 => local yl
-local4 => implicit local yil
+local0 => val local xl
+local1 => lazy val local xzl
+local2 => implicit val local xil
+local3 => var local yl
+local4 => implicit var local yil
 
 Occurrences:
 [0:8..0:15): example <- example/
@@ -3459,4 +3454,3 @@ Occurrences:
 [2:46..2:47): z -> _empty_/toplevel$package.combine(+1).(z)
 [3:4..3:11): combine <- _empty_/toplevel$package.combine(+2).
 [4:4..4:7): foo <- _empty_/toplevel$package.foo().
-