remove companionClass and companionModule. Updated readme. Refactored getchildren

Author: poechsel

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

@@ -30,10 +30,6 @@ 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

@@ -21,11 +21,6 @@ trait SymbolOps extends Core {
     /** Full name of the definition from 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/Makefile

@@ -8,4 +8,4 @@ test: all
 	cd ..; sbt dotty-semanticdb/test; cd -
 
 %.tasty: $(files)
-	cd $(dir $^); $(CURDIR)/../bin/dotc $(notdir $^)
+	cd $(dir $<); $(CURDIR)/../bin/dotc $(notdir $^)

semanticdb/readme.md

@@ -10,6 +10,14 @@ sbt
 > compile
 ```
 
+You will also need to generate the tasty files for the test. For now, you can
+easily do it by executing the makefile in this folder:
+```
+make
+```
+Please note that the makefile will also compile the `semanticdb/input` project.
+
+
 In the second terminal, run `sbt dotty-semanticdb/test` from the main dotty
 build
 

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -23,22 +23,16 @@ class SemanticdbConsumer extends TastyConsumer {
     import reflect._
 
     object ChildTraverser extends TreeTraverser {
-      var depth: Int = 0
       var children: List[Tree] = Nil
-      override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = {
-        if (depth == 0) {
-          depth = depth + 1
-          super.traverseTree(tree)
-          depth = depth - 1
-        } else {
-          children = tree :: children
-        }
-      }
-      def getChildren(tree: Tree)(implicit ctx: Context): List[Position] = {
+      override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = children = tree::children
+      override def traversePattern(pattern: Pattern)(implicit ctx: Context): Unit = ()
+      override def traverseTypeTree(tree: TypeOrBoundsTree)(implicit ctx: Context): Unit = ()
+      override def traverseCaseDef(tree: CaseDef)(implicit ctx: Context): Unit = ()
+
+      def getChildren(tree: Tree)(implicit ctx: Context): List[Tree] = {
         children = Nil
-        depth = 0
-        traverseTree(tree)(ctx)
-        return children.map(_.pos)
+        traverseTreeChildren(tree)(ctx)
+        return children
       }
     }
 
@@ -48,7 +42,7 @@ class SemanticdbConsumer extends TastyConsumer {
       implicit class TreeExtender(tree: Tree) {
         def isUserCreated: Boolean = {
           val children: List[Position] =
-            ChildTraverser.getChildren(tree)(reflect.rootContext)
+            ChildTraverser.getChildren(tree)(reflect.rootContext).map(_.pos)
           return !((tree.pos.exists && tree.pos.start == tree.pos.end && children == Nil) || children
             .exists(_ == tree.pos))
         }
@@ -117,7 +111,10 @@ class SemanticdbConsumer extends TastyConsumer {
                 if (symbol.isPackage) {
                   d.Package(symbol.name)
                 } else if (symbol.isObject) {
-                  d.Term(symbol.companionModule.name)
+                  symbol.asClass.companionModule match {
+                    case Some(module) => d.Term(module.name)
+                    case _ => d.Term(symbol.name)
+                  }
                 } else if (symbol.isMethod) {
                   d.Method(symbol.name,
                            disimbiguate(previous_symbol + symbol.name))