add namePos to tastyreflect symbol and start generating valid semanticdb

Author: poechsel

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

@@ -14,5 +14,4 @@ trait PositionOpsImpl extends scala.tasty.reflect.PositionOps with CoreImpl {
     def startColumn: Int = pos.startColumn
     def endColumn: Int = pos.endColumn
   }
-
 }

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

@@ -26,6 +26,8 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
     def name(implicit ctx: Context): String = symbol.name.toString
     def fullName(implicit ctx: Context): String = symbol.fullName.toString
 
+    def pos(implicit ctx: Context): Position = symbol.pos
+
     def owner(implicit ctx: Context): Symbol = symbol.owner
 
     def localContext(implicit ctx: Context): Context = {

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

@@ -26,7 +26,8 @@ trait SymbolOps extends Core {
     /** The full name of this symbol up to the root package. */
     def fullName(implicit ctx: Context): String
 
-    /** Returns the context within this symbol. */
+    def pos(implicit ctx: Context): Position
+
     def localContext(implicit ctx: Context): Context
 
     /** Unsafe cast as to PackageSymbol. Use IsPackageSymbol to safly check and cast to PackageSymbol */

project/Build.scala

@@ -393,6 +393,9 @@ object Build {
     baseDirectory in Test := baseDirectory.value / "..",
     unmanagedSourceDirectories in Test += baseDirectory.value / "input" / "src" / "main" / "scala",
     libraryDependencies ++= List(
+      ("org.scalameta" %% "semanticdb" % "4.0.0" % Compile).withDottyCompat(scalaVersion.value),
+      "com.novocode" % "junit-interface" % "0.11" % Compile,
+      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % Compile,
       ("org.scalameta" %% "semanticdb" % "4.0.0" % Test).withDottyCompat(scalaVersion.value),
       "com.novocode" % "junit-interface" % "0.11" % Test,
       "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % Test

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -6,6 +6,7 @@ import scala.tasty.file.TastyConsumer
 import scala.tasty.util.TreeTraverser
 import dotty.tools.dotc.tastyreflect
 import scala.collection.mutable.HashMap
+import scala.meta.internal.{semanticdb => s}
 
 class SemanticdbConsumer extends TastyConsumer {
   var stack: List[String] = Nil
@@ -32,6 +33,12 @@ class SemanticdbConsumer extends TastyConsumer {
       ""
     }
   }*/
+  val semantic: s.TextDocument = s.TextDocument()
+  var occurrences: Seq[s.SymbolOccurrence] = Seq()
+
+  def toSemanticdb(text: String): s.TextDocument = {
+    s.TextDocument(text = text, occurrences = occurrences)
+  }
 
   final def apply(reflect: Reflection)(root: reflect.Tree): Unit = {
     import reflect._
@@ -65,6 +72,10 @@ class SemanticdbConsumer extends TastyConsumer {
               // TODO had a "NoDenotation" test to avoid
               // relying on the name itself
               ""
+            } else if (symbol.name == "<root>") then {
+              // TODO had a "NoDenotation" test to avoid
+              // relying on the name itself
+              ""
             } else {
               val previous_symbol = iterateParent(symbol.owner)
               val next_atom =
@@ -89,63 +100,30 @@ class SemanticdbConsumer extends TastyConsumer {
         val previous_path = stack.head
 
         tree match {
-          /*case IsClassDef(body) =>
-            val ClassDef(name, _, _, _, _) = body
-            //println("[classdef] ", body)
-            val path = stack.head + name + "#"
-            println(path)
-            stack = path :: stack
-            super.traverseTree(body)
-            stack = stack.tail
-          case IsTypeDef(body) =>
-            println("[typedef] ", body)
-            super.traverseTree(body)
-          case IsDefDef(body) =>
-            val DefDef(name, _, _, _, _) = body
-            val def_atom =
-            name match {
-              case "<init>" => "`<init>`"
-              case _ => name
-            }
-            val path_repr = stack.head + def_atom
-            val path = path_repr + "(" + insertPathDefDef(path_repr) + ")."
-            println(path)
-            //println("[defdef] ", body)
-            stack = path :: stack
-            super.traverseTree(body)
-            stack = stack.tail
-          case IsValDef(body) =>
-            val ValDef(name, _, _) = body
-            val path_repr = stack.head + name
-            val path = path_repr + "(" + insertPathValDef(path_repr) + ")"
-            println(path)
-            //println("[defdef] ", body)
-            stack = path :: stack
-            super.traverseTree(body)
-            stack = stack.tail
-          case IsPackageDef(body) =>
-            println("[packagedef] ", body)
-            super.traverseTree(body)*/
           case IsDefinition(body) =>
             //println("[definition] ", body)
-            println(iterateParent(tree.symbol))
-            super.traverseTree(body)
-          /*case IsPackageClause(body) =>
-            //println(body.pos.start, body.pos.end)
-            val PackageClause(name, list_tree : List[Tree]) = body
-            //println(tree)
-            val path = packageDefToOccurence(name)
-            println(path)
-            stack = path :: stack
-            // call to traverse tree instead of super.traverseTree to avoid
-            // skipping this child entirely (super.xx will traverse subtrees)
-            //list_tree.foreach{traverseTree}
-          /*case IsTerm(body) =>
-            //println("[term] ", body)
-            super.traverseTree(body)*/
-            // iterating this way will probably make us see terms we don't want
+            val symbol_path = iterateParent(tree.symbol)
+
+            val range =
+              if (tree.symbol.name == "<init>") {
+                s.Range(tree.symbol.pos.startLine,
+                        tree.symbol.pos.startColumn,
+                        tree.symbol.pos.startLine,
+                        tree.symbol.pos.endColumn)
+              } else {
+                s.Range(tree.symbol.pos.startLine,
+                        tree.symbol.pos.startColumn,
+                        tree.symbol.pos.startLine,
+                        tree.symbol.pos.startColumn + tree.symbol.name.length)
+              }
+            occurrences =
+              occurrences :+
+                s.SymbolOccurrence(
+                  Some(range),
+                  symbol_path,
+                  s.SymbolOccurrence.Role.DEFINITION
+                )
             super.traverseTree(body)
-            stack = stack.tail*/
           case tree =>
             super.traverseTree(tree)
         }

semanticdb/test/dotty/semanticdb/Tests.scala

@@ -34,8 +34,10 @@ class Tests {
       case pat(name) => name
       case _ => ""
       }
-    val _ = ConsumeTasty(classpath, (modulename + "." + sourcename) :: Nil, new SemanticdbConsumer)
-    return s.TextDocument(text = scalac.text)
+    val sdbconsumer = new SemanticdbConsumer
+    val _ = ConsumeTasty(classpath, (modulename + "." + sourcename) :: Nil, sdbconsumer)
+    sdbconsumer.toSemanticdb(scalac.text)
+
   }
 
   /** Fails the test if the s.TextDocument from tasty and semanticdb-scalac are not the same. */