add companionClass and companionModule to tastyreflect + use them to select correct symbol name

Author: poechsel

compiler/src/dotty/tools/dotc/tastyreflect/SymbolOpsImpl.scala

@@ -30,6 +30,10 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
 
     def owner(implicit ctx: Context): Symbol = symbol.owner
 
+    def companionModule(implicit ctx: Context): Symbol = symbol.companionModule
+
+    def companionClass(implicit ctx: Context): Symbol = symbol.companionClass
+
     def localContext(implicit ctx: Context): Context = {
       if (symbol.exists) ctx.withOwner(symbol)
       else ctx

library/src/scala/tasty/reflect/SymbolOps.scala

@@ -26,6 +26,11 @@ trait SymbolOps extends Core {
     /** The full name of this symbol up to the root package. */
     def fullName(implicit ctx: Context): String
 
+
+    def companionModule(implicit ctx: Context): Symbol
+
+    def companionClass(implicit ctx: Context): Symbol
+
     def pos(implicit ctx: Context): Position
 
     def localContext(implicit ctx: Context): Context

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -70,6 +70,8 @@ class SemanticdbConsumer extends TastyConsumer {
           case _ => false
         }
 
+        def isObject: Boolean = symbol.flags.isObject
+
         def isTrait: Boolean = symbol.flags.isTrait
 
         def isValueParameter: Boolean = symbol.flags.isParam
@@ -105,13 +107,17 @@ class SemanticdbConsumer extends TastyConsumer {
               val next_atom =
               if (symbol.isPackage) {
                 d.Package(symbol.name)
-              } else if (symbol.isTypeParameter)  {
-                d.TypeParameter(symbol.name)
+              } else if (symbol.isObject) {
+                d.Term(symbol.companionModule.name)
               } else if (symbol.isMethod) {
                 d.Method(symbol.name, disimbiguate(previous_symbol + symbol.name))
               } else if (symbol.isValueParameter) {
                 d.Parameter(symbol.name)
+              } else if (symbol.isTypeParameter)  {
+                d.TypeParameter(symbol.name)
               } else if (symbol.isType || symbol.isTrait) {
+                //println(symbol.name, symbol.companionClass.name, symbol.companionModule.name, symbol.flags.toString)
+
                 d.Type(symbol.name)
               } else {
                 d.Term(symbol.name)