Merge pull request #5435 from poechsel/tasty-to-semanticdb

nicolasstucki · web-flow · commit 7652a2f06583 · 2018-11-22T17:45:06.000+01:00
Addition to TASTy reflect to semantic DB
diff --git a/build.sbt b/build.sbt
@@ -13,6 +13,7 @@ val `dotty-language-server` = Build.`dotty-language-server`
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
 val `dotty-semanticdb` = Build.`dotty-semanticdb`
+val `dotty-semanticdb-input` = Build.`dotty-semanticdb-input`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/PositionOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/PositionOpsImpl.scala
@@ -6,6 +6,8 @@ trait PositionOpsImpl extends scala.tasty.reflect.PositionOps with CoreImpl {
     def start: Int = pos.start
     def end: Int = pos.end
 
+    def exists: Boolean = pos.exists
+
     def sourceFile: java.nio.file.Path = pos.source.file.jpath
 
     def startLine: Int = pos.startLine
@@ -14,5 +16,4 @@ trait PositionOpsImpl extends scala.tasty.reflect.PositionOps with CoreImpl {
     def startColumn: Int = pos.startColumn
     def endColumn: Int = pos.endColumn
   }
-
 }
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/SymbolOpsImpl.scala b/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 = {
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/TypeOrBoundsTreesOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/TypeOrBoundsTreesOpsImpl.scala
@@ -18,8 +18,8 @@ trait TypeOrBoundsTreesOpsImpl extends scala.tasty.reflect.TypeOrBoundsTreeOps w
 
   def TypeTreeDeco(tpt: TypeTree): TypeTreeAPI = new TypeTreeAPI {
     def pos(implicit ctx: Context): Position = tpt.pos
-    def tpe(implicit ctx: Context): Type = tpt.tpe.stripTypeVar
     def symbol(implicit ctx: Context): Symbol = tpt.symbol
+    def tpe(implicit ctx: Context): Type = tpt.tpe.stripTypeVar
   }
 
   object IsTypeTree extends IsTypeTreeExtractor {
diff --git a/library/src/scala/tasty/reflect/PositionOps.scala b/library/src/scala/tasty/reflect/PositionOps.scala
@@ -4,7 +4,8 @@ trait PositionOps extends Core {
 
   trait PositionAPI {
 
-    /** The path of source file */
+    def exists: Boolean
+
     def sourceFile: java.nio.file.Path
 
     /** The start index in the source file */
diff --git a/library/src/scala/tasty/reflect/SymbolOps.scala b/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 */
diff --git a/library/src/scala/tasty/reflect/TreeUtils.scala b/library/src/scala/tasty/reflect/TreeUtils.scala
@@ -104,6 +104,7 @@ trait TreeUtils
       case TypeTree.Block(typedefs, tpt) => foldTypeTree(foldTrees(x, typedefs), tpt)
       case TypeTree.MatchType(boundopt, selector, cases) =>
         foldTypeCaseDefs(foldTypeTree(boundopt.fold(x)(foldTypeTree(x, _)), selector), cases)
+      case SyntheticBounds() => x
       case TypeBoundsTree(lo, hi) => foldTypeTree(foldTypeTree(x, lo), hi)
     }
 
diff --git a/library/src/scala/tasty/reflect/TypeOrBoundsTreeOps.scala b/library/src/scala/tasty/reflect/TypeOrBoundsTreeOps.scala
@@ -28,6 +28,7 @@ trait TypeOrBoundsTreeOps extends Core {
   val TypeTree: TypeTreeModule
   abstract class TypeTreeModule extends TypeTreeCoreModule {
 
+
     /** TypeTree containing an inferred type */
     val Synthetic: SyntheticExtractor
     abstract class SyntheticExtractor {
diff --git a/project/Build.scala b/project/Build.scala
@@ -393,9 +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" % Test).withDottyCompat(scalaVersion.value),
-      "com.novocode" % "junit-interface" % "0.11" % Test,
-      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % Test
+      ("org.scalameta" %% "semanticdb" % "4.0.0").withDottyCompat(scalaVersion.value),
+      "com.novocode" % "junit-interface" % "0.11",
+      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0"
     )
   )
 
@@ -919,6 +919,11 @@ object Build {
   lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)
 
   lazy val `dotty-semanticdb` = project.in(file("semanticdb")).asDottySemanticdb(Bootstrapped)
+  lazy val `dotty-semanticdb-input` = project.in(file("semanticdb/input")).settings(
+    scalaVersion := "2.12.7",
+    scalacOptions += "-Yrangepos",
+    addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.0.0" cross CrossVersion.full)
+  )
 
   // Depend on dotty-library so that sbt projects using dotty automatically
   // depend on the dotty-library
@@ -1317,6 +1322,7 @@ object Build {
       enablePlugins(JmhPlugin)
 
     def asDottySemanticdb(implicit mode: Mode): Project = project.withCommonSettings.
+      aggregate(`dotty-semanticdb-input`).
       dependsOn(dottyCompiler).
       settings(semanticdbSettings)
 
diff --git a/semanticdb/input/src/main/scala/example/Access.scala b/semanticdb/input/src/main/scala/example/Access.scala
@@ -0,0 +1,11 @@
+package example
+
+class Access {
+  private def m1 = ???
+  private[this] def m2 = ???
+  private[Access] def m3 = ???
+  protected def m4 = ???
+  protected[this] def m5 = ???
+  protected[example] def m6 = ???
+  def m7 = ???
+}
diff --git a/semanticdb/input/src/main/scala/example/Advanced.scala b/semanticdb/input/src/main/scala/example/Advanced.scala
@@ -0,0 +1,39 @@
+package example
+
+import scala.language.existentials
+import scala.language.higherKinds
+import scala.language.reflectiveCalls
+
+class AdvC[T] {
+  def t: T = ???
+}
+
+class Structural {
+  def s1: { val x: Int } = ???
+  def s2 = new { val x: Int = ??? }
+  def s3 = new { def m(x: Int): Int = ??? }
+}
+
+class Existential {
+  def e1: List[_] = ???
+}
+
+class AdvD[CC[B]] extends AdvC[CC[B]]
+
+object AdvTest {
+  val s = new Structural
+  val s1 = s.s1
+  val s2 = s.s2
+  val s3 = s.s3
+
+  val e = new Existential
+  val e1 = e.e1
+  val e1x = e.e1.head
+  locally {
+    (??? : Any) match {
+      case e3: List[_] =>
+        val e3x = e3.head
+        ()
+    }
+  }
+}
diff --git a/semanticdb/input/src/main/scala/example/Anonymous.scala b/semanticdb/input/src/main/scala/example/Anonymous.scala
@@ -0,0 +1,18 @@
+package example
+import scala.language.higherKinds
+
+class Anonymous {
+  this: Anonymous =>
+
+  def m1[T[_], B] = ???
+  def m2: Map[_, List[_]] = ???
+  locally {
+    ??? match { case _: List[_] => }
+  }
+  locally {
+    val x: Int => Int = _ => ???
+  }
+
+  trait Foo
+  var x = new Foo {}
+}
diff --git a/semanticdb/input/src/main/scala/example/Classes.scala b/semanticdb/input/src/main/scala/example/Classes.scala
@@ -0,0 +1,33 @@
+package example
+
+class C1(val x1: Int) extends AnyVal
+
+class C2(val x2: Int) extends AnyVal
+object C2
+
+case class C3(x: Int)
+
+case class C4(x: Int)
+object C4
+
+object M {
+  implicit class C5(x: Int)
+}
+
+case class C6(private val x: Int)
+
+class C7(x: Int)
+
+class C8(private[this] val x: Int)
+
+class C9(private[this] var x: Int)
+
+object N {
+  val anonClass = new C7(42) {
+    val local = ???
+  }
+  val anonFun = List(1).map { i =>
+    val local = 2
+    local + 2
+  }
+}
diff --git a/semanticdb/input/src/main/scala/example/Empty.scala b/semanticdb/input/src/main/scala/example/Empty.scala
@@ -0,0 +1,9 @@
+package example
+
+class AdvA {
+  def b: AdvB = ???
+}
+
+class AdvB {
+  def a: AdvA = ???
+}
diff --git a/semanticdb/input/src/main/scala/example/EmptyObject.scala b/semanticdb/input/src/main/scala/example/EmptyObject.scala
@@ -0,0 +1,3 @@
+package example
+
+object EmptyObject {}
diff --git a/semanticdb/input/src/main/scala/example/Example.scala b/semanticdb/input/src/main/scala/example/Example.scala
@@ -15,3 +15,7 @@ class Example {
       y
     )
 }
+
+class ExampleInit() {
+
+}
diff --git a/semanticdb/input/src/main/scala/example/Example2.scala b/semanticdb/input/src/main/scala/example/Example2.scala
@@ -0,0 +1,10 @@
+package example
+
+import scala.concurrent.Future
+
+object OExample { self =>
+  def main(args: Array[String]): Unit = {
+    println(1)
+  }
+  val x = scala.reflect.classTag[Int]
+}
diff --git a/semanticdb/input/src/main/scala/example/Exclude.scala b/semanticdb/input/src/main/scala/example/Exclude.scala
@@ -0,0 +1,4 @@
+package example
+
+// This class should be excluded by semanticdb.
+class Exclude
diff --git a/semanticdb/input/src/main/scala/example/Flags.scala b/semanticdb/input/src/main/scala/example/Flags.scala
@@ -0,0 +1,24 @@
+package example
+
+package object p {
+  private lazy val x = 1
+  protected implicit var y: Int = 2
+  def z(pp: Int) = 3
+  def m[TT] = ???
+  abstract class C[+T, -U, V](x: T, y: U, z: V) {
+    def this() = this(???, ???, ???)
+    def w: Int
+  }
+  type T1 = Int
+  type T2[T] = S[T]
+  type U <: Int
+  type V >: Int
+  case object X
+  final class Y
+  sealed trait Z
+  class AA(x: Int, val y: Int, var z: Int)
+  class S[@specialized T]
+  val List(xs1) = ???
+  ??? match { case List(xs2) => ??? }
+  ??? match { case _: List[t] => ??? }
+}
diff --git a/semanticdb/input/src/main/scala/example/Imports.scala b/semanticdb/input/src/main/scala/example/Imports.scala
@@ -0,0 +1 @@
+//import scala.util.control.NonFatal
diff --git a/semanticdb/input/src/main/scala/example/Issue1749.scala b/semanticdb/input/src/main/scala/example/Issue1749.scala
@@ -0,0 +1,11 @@
+// See https://github.com/scalameta/scalameta/issues/1749
+package example
+
+import scala.math.Ordered.orderingToOrdered
+
+class Issue1749 {
+  val x1 = 42
+  val x2 = 42
+  (x1, x1)
+    .compare((x2, x2))
+}
diff --git a/semanticdb/input/src/main/scala/example/Locals.scala b/semanticdb/input/src/main/scala/example/Locals.scala
@@ -0,0 +1,8 @@
+package example
+
+object Test {
+  val xs = {
+    val x = 42
+    List(x)
+  }
+}
diff --git a/semanticdb/input/src/main/scala/example/MacroAnnotations.scala b/semanticdb/input/src/main/scala/example/MacroAnnotations.scala
@@ -0,0 +1,5 @@
+package example
+
+//@MacroAnnotation
+class MacroAnnotations
+object MacroAnnotations
diff --git a/semanticdb/input/src/main/scala/example/MethodUsages.scala b/semanticdb/input/src/main/scala/example/MethodUsages.scala
@@ -0,0 +1,33 @@
+package example
+
+class MethodUsages {
+  val m = new Methods[Int]
+  m.m1
+  m.m2()
+  m.m3(0)
+  m.m4(0)(0)
+  m.m5("")
+  m.m5(0)
+  m.m6(0)
+  m.m6(new m.List[Int])
+  m.m6(Nil)
+  m.m7a(m, new m.List[Int])
+  m.m7b(new m.List[Int])
+  m.`m8().`()
+  m.m9(null)
+  m.m10(null)
+  m.m11(Predef)
+  m.m11(OExample)
+  m.m12a(null)
+  m.m12b(null)
+  m.m13(0)
+  m.m15(0)
+  m.m16(0)
+  m.m16(0)
+  m.m17.m()
+  m.m17(1)
+  m.m17("")
+  m.m18.m()
+  m.m18(1)
+  m.m18("")
+}
diff --git a/semanticdb/input/src/main/scala/example/Methods.scala b/semanticdb/input/src/main/scala/example/Methods.scala
@@ -0,0 +1,38 @@
+package example
+
+import scala.math.Ordering
+import scala.language.existentials
+
+class Methods[T] {
+  class List[T]
+  type AList[T] = List[T]
+  def m1 = ???
+  def m2() = ???
+  def m3(x: Int) = ???
+  def m4(x: Int)(y: Int) = ???
+  def m5(x: String) = ???
+  def m5(x: Int) = ???
+  def m6(x: Int) = ???
+  def m6(x: List[T]) = ???
+  def m6(x: scala.List[T]) = ???
+  def m7a[U: Ordering](c: Methods[T], l: List[U]) = ???
+  def m7b[U <: T](l: List[U]) = ???
+  def `m8().`() = ???
+  class `m9().`
+  def m9(x: `m9().`) = ???
+  def m10(x: AList[T]) = ???
+  def m11(x: Predef.type) = ???
+  def m11(x: OExample.type) = ???
+  def m12a(x: {}) = ???
+  def m12b(x: { val x: Int }) = ???
+  def m13(x: Int @unchecked) = ???
+  def m15(x: => Int) = ???
+  def m16(x: Int*) = ???
+  object m17 { def m() = ??? }
+  def m17(a: Int) = ???
+  def m17(b: String) = ???
+  val m18 = m17
+  def m18(a: Int) = ???
+  def m18(b: String) = ???
+  def m19(x: Int, y: Int = 2)(z: Int = 3) = ???
+}
diff --git a/semanticdb/input/src/main/scala/example/Objects.scala b/semanticdb/input/src/main/scala/example/Objects.scala
@@ -0,0 +1,5 @@
+package example
+
+object X {
+  object Y
+}
diff --git a/semanticdb/input/src/main/scala/example/Overrides.scala b/semanticdb/input/src/main/scala/example/Overrides.scala
@@ -0,0 +1,4 @@
+package example
+
+trait OveA { def foo: Int }
+class OveB() extends OveA { def foo: Int = 2 }
diff --git a/semanticdb/input/src/main/scala/example/Prefixes.scala b/semanticdb/input/src/main/scala/example/Prefixes.scala
diff --git a/semanticdb/input/src/main/scala/example/Selfs.scala b/semanticdb/input/src/main/scala/example/Selfs.scala
diff --git a/semanticdb/input/src/main/scala/example/Synthetic.scala b/semanticdb/input/src/main/scala/example/Synthetic.scala
diff --git a/semanticdb/input/src/main/scala/example/Traits.scala b/semanticdb/input/src/main/scala/example/Traits.scala
diff --git a/semanticdb/input/src/main/scala/example/Types.scala b/semanticdb/input/src/main/scala/example/Types.scala
diff --git a/semanticdb/input/src/main/scala/example/Vals.scala b/semanticdb/input/src/main/scala/example/Vals.scala
diff --git a/semanticdb/input/src/main/scala/example/local-file.scala b/semanticdb/input/src/main/scala/example/local-file.scala
diff --git a/semanticdb/src/dotty/semanticdb/Scala.scala b/semanticdb/src/dotty/semanticdb/Scala.scala
diff --git a/semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala b/semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala
diff --git a/semanticdb/test/dotty/semanticdb/Semanticdbs.scala b/semanticdb/test/dotty/semanticdb/Semanticdbs.scala
diff --git a/semanticdb/test/dotty/semanticdb/Tests.scala b/semanticdb/test/dotty/semanticdb/Tests.scala

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ trait PositionOpsImpl extends scala.tasty.reflect.PositionOps with CoreImpl {`
`6`	`6`	`def start: Int = pos.start`
`7`	`7`	`def end: Int = pos.end`
`8`	`8`
	`9`	`+ def exists: Boolean = pos.exists`
	`10`	`+`
`9`	`11`	`def sourceFile: java.nio.file.Path = pos.source.file.jpath`
`10`	`12`
`11`	`13`	`def startLine: Int = pos.startLine`
`@@ -14,5 +16,4 @@ trait PositionOpsImpl extends scala.tasty.reflect.PositionOps with CoreImpl {`
`14`	`16`	`def startColumn: Int = pos.startColumn`
`15`	`17`	`def endColumn: Int = pos.endColumn`
`16`	`18`	`}`
`17`		`-`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ trait TypeOrBoundsTreesOpsImpl extends scala.tasty.reflect.TypeOrBoundsTreeOps w`
`18`	`18`
`19`	`19`	`def TypeTreeDeco(tpt: TypeTree): TypeTreeAPI = new TypeTreeAPI {`
`20`	`20`	`def pos(implicit ctx: Context): Position = tpt.pos`
`21`		`- def tpe(implicit ctx: Context): Type = tpt.tpe.stripTypeVar`
`22`	`21`	`def symbol(implicit ctx: Context): Symbol = tpt.symbol`
	`22`	`+ def tpe(implicit ctx: Context): Type = tpt.tpe.stripTypeVar`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`object IsTypeTree extends IsTypeTreeExtractor {`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ trait TreeUtils`
`104`	`104`	`case TypeTree.Block(typedefs, tpt) => foldTypeTree(foldTrees(x, typedefs), tpt)`
`105`	`105`	`case TypeTree.MatchType(boundopt, selector, cases) =>`
`106`	`106`	`foldTypeCaseDefs(foldTypeTree(boundopt.fold(x)(foldTypeTree(x, _)), selector), cases)`
	`107`	`+ case SyntheticBounds() => x`
`107`	`108`	`case TypeBoundsTree(lo, hi) => foldTypeTree(foldTypeTree(x, lo), hi)`
`108`	`109`	`}`
`109`	`110`