improve 'isUserCreated' for typetrees

Author: poechsel

semanticdb/input/src/main/scala/example/BinaryOp.scala

@@ -1,5 +1,5 @@
 package example
 
 class BinaryOp {
-  1 #:: 2 #:: Stream.empty
+  1 #:: 2 #:: Stream.empty[Int]
 }

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -35,12 +35,14 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
 
     object ChildTraverser extends TreeTraverser {
       var children: List[Tree] = Nil
+      var childrenType: List[TypeOrBoundsTree] = Nil
       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 = ()
+          implicit ctx: Context): Unit =
+          childrenType = tree :: childrenType
       override def traverseCaseDef(tree: CaseDef)(implicit ctx: Context): Unit =
         ()
       override def traverseTypeCaseDef(tree: TypeCaseDef)(
@@ -52,6 +54,11 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
         traverseTreeChildren(tree)(ctx)
         return children
       }
+      def getChildrenType(tree: TypeOrBoundsTree)(implicit ctx: Context): List[TypeOrBoundsTree] = {
+        childrenType = Nil
+        traverseTypeTreeChildren(tree)(ctx)
+        return childrenType
+      }
     }
 
     object Traverser extends TreeTraverser {
@@ -66,6 +73,12 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
 
       implicit class TypeTreeExtender(tree: TypeTree) {
         def isUserCreated: Boolean = {
+          val children: List[Position] =
+            ChildTraverser.getChildrenType(tree)(reflect.rootContext).collect(_ match {
+            case IsTypeTree(tt) => tt.pos})
+          println(children)
+          return !((tree.pos.exists && tree.pos.start == tree.pos.end && children == Nil) || children
+            .exists(_ == tree.pos))
           return !(tree.pos.exists && tree.pos.start == tree.pos.end)
         }
       }
@@ -436,7 +449,7 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
       def addOccurenceTypeTree(typetree: TypeTree,
                                type_symbol: s.SymbolOccurrence.Role,
                                range: s.Range): Unit = {
-        println(typetree)
+        println(typetree.symbol, typetree.isUserCreated)
         if (typetree.isUserCreated) {
           addOccurence(typetree.symbol, type_symbol, range)
         }

semanticdb/test/dotty/semanticdb/Tests.scala

@@ -175,7 +175,7 @@ class Tests {
   }
 
 
- /*@Test def testAccess(): Unit = checkFile("example/Access.scala")
+  /*@Test def testAccess(): Unit = checkFile("example/Access.scala")
   @Test def testAdvanced(): Unit = checkFile("example/Advanced.scala")
   @Test def testAnonymous(): Unit = checkFile("example/Anonymous.scala")
   @Test def testClasses(): Unit = checkFile("example/Classes.scala")
@@ -205,8 +205,9 @@ class Tests {
   @Test def testIgnoredSymbol(): Unit = checkFile("example/IgnoredSymbol.scala")
   @Test def testCase(): Unit = checkFile("example/Case.scala")
   @Test def testApply(): Unit = checkFile("example/Apply.scala")
+  @Test def testMethodUsages(): Unit = checkFile("example/MethodUsages.scala")
   @Test def testTypeBug(): Unit = checkFile("example/TypeBug.scala")*/
+  @Test def testTraits(): Unit = checkFile("example/Traits.scala")
   //@Test def testSynthetic(): Unit = checkFile("example/Synthetic.scala")
   //@Test def testBinaryOp(): Unit = checkFile("example/BinaryOp.scala")
-  @Test def testMethodUsages(): Unit = checkFile("example/MethodUsages.scala")
 }