improve position for self symbols

Author: poechsel

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -11,7 +11,9 @@ import scala.meta.internal.{semanticdb => s}
 import dotty.semanticdb.Scala.{Descriptor => d}
 import dotty.semanticdb.Scala._
 
-class SemanticdbConsumer extends TastyConsumer {
+import scala.io.Source
+
+class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
   var stack: List[String] = Nil
 
   val semantic: s.TextDocument = s.TextDocument()
@@ -24,6 +26,8 @@ class SemanticdbConsumer extends TastyConsumer {
   val symbolsCache: HashMap[(String, s.Range), String] = HashMap()
   var local_offset: Int = 0
 
+  val sourceCode = Source.fromFile(sourceFile.toFile).mkString
+
   final def apply(reflect: Reflection)(root: reflect.Tree): Unit = {
     import reflect._
 
@@ -373,7 +377,6 @@ class SemanticdbConsumer extends TastyConsumer {
         if (symbolPathsMap.contains(key)) return
         if (is_global) {
           symbolPathsMap += key
-          println("duplicates", key)
         }
         println(symbol_path, range, symbol.owner.flags, is_global)
         occurrences =
@@ -591,34 +594,34 @@ class SemanticdbConsumer extends TastyConsumer {
             parents.foreach(_ match {
               case IsTypeTree(t) => traverseTypeTree(t)
               case IsTerm(t) => {
-                println(t.pos.startColumn, t.pos.endColumn)
                 traverseTree(t)
               }
             })
             forceAddBecauseParents = false
 
             selfopt match {
-              case Some(vdef @ ValDef(name, _, _)) => {
-                val posColumn: Int = parents.foldLeft(vdef.pos.startColumn)(
+              case Some(vdef @ ValDef(name, _, _)) if name != "_" => {
+                // To find the current position, we will heuristically
+                // reparse the source code.
+                // The process is done in three steps:
+                // 1) Find a position before the '{' of the self but after any
+                //  non related '{'. Here, it will be the largest end pos of a parent
+                // 2) Find the first '{'
+                // 3) Iterate until the character we are seeing is a letter
+                val startPosSearch: Int = parents.foldLeft(tree.pos.endColumn)(
                   (old: Int, ct: TermOrTypeTree) =>
                     ct match {
-                      case IsTerm(t) =>
-                        if (t.pos.endColumn + 3 < old) { t.pos.endColumn + 3 } else {
-                          old
-                        }
+                      case IsTerm(t) if t.pos.endColumn < old => t.pos.endColumn
                       case _ => old
                   })
-                println(posColumn)
-                println(vdef)
-                println(vdef.pos.startColumn,
-                        tree.pos.startColumn,
-                        tree.pos.endColumn)
+                var posColumn = sourceCode.indexOf("{", startPosSearch)
+                while (!sourceCode(posColumn).isLetter && posColumn < sourceCode.length) posColumn += 1
+
                 addSelfDefinition(name,
                                   s.Range(vdef.pos.startLine,
                                           posColumn,
                                           vdef.pos.endLine,
                                           posColumn + name.length))
-                println(name)
               }
               case _ =>
             }

semanticdb/test/dotty/semanticdb/Tests.scala

@@ -129,7 +129,7 @@ class Tests {
       scalac
     } else {
       val (classpaths, classnames) = tasty_classes.unzip
-      val sdbconsumer = new SemanticdbConsumer
+      val sdbconsumer = new SemanticdbConsumer(scalaFile)
 
       val _ = ConsumeTasty(classpaths.head, classnames, sdbconsumer)
       sdbconsumer.toSemanticdb(scalac.text)
@@ -191,12 +191,12 @@ class Tests {
   //@Test def testLocals(): Unit = checkFile("example/Locals.scala")
   //@Test def testMacroAnnotations(): Unit = checkFile("example/MacroAnnotations.scala")
   //WIP(assert) @Test def testMethods(): Unit = checkFile("example/Methods.scala")
-  @Test def testMultiArguments(): Unit = checkFile("example/MultiArguments.scala")
+  //@Test def testMultiArguments(): Unit = checkFile("example/MultiArguments.scala")
   //@Test def testMethodUsages(): Unit = checkFile("example/MethodUsages.scala")
   //def testObjects(): Unit = checkFile("example/Objects.scala")
   //@Test def testOverrides(): Unit = checkFile("example/Overrides.scala")
   //WIP @Test def testPrefixes(): Unit = checkFile("example/Prefixes.scala")
-  //@Test def testSelfs(): Unit = checkFile("example/Selfs.scala")
+  @Test def testSelfs(): Unit = checkFile("example/Selfs.scala")
   //@Test def testSelfUse(): Unit = checkFile("example/SelfUse.scala")
   //WIP @Test def testSynthetic(): Unit = checkFile("example/Synthetic.scala")
   //WIP @Test def testTraits(): Unit = checkFile("example/Traits.scala")
@@ -206,13 +206,4 @@ class Tests {
   //@Test def testNew(): Unit = checkFile("example/New.scala")
   //@Test def testIgnoredSymbol(): Unit = checkFile("example/IgnoredSymbol.scala")
   //@Test def testCase(): Unit = checkFile("example/Case.scala")
-
-
-  def testOutput(className: String, expected: String): Unit = {
-    val out = new StringBuilder
-    ConsumeTasty(tastyClassDirectory, List(className), new SemanticdbConsumer {
-      override def println(x: Any): Unit = out.append(x).append(";")
-    })
-    assertEquals(expected, out.result())
-  }
 }