merged semanticdb/input/build.sbt with project/Build.scala

Author: poechsel

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`

project/Build.scala

@@ -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)
 

semanticdb/test/dotty/semanticdb/Semanticdbs.scala

@@ -7,7 +7,7 @@ import scala.collection.JavaConverters._
 import dotty.tools.dotc.util.SourceFile
 
 object Semanticdbs {
-
+  private val buildSubFolder = "semanticdb/input/"
   /**
    * Utility to load SemanticDB for Scala source files.
    *
@@ -17,7 +17,7 @@ object Semanticdbs {
    *                  if you only care about reading SemanticDB files from a single project.
    */
   class Loader(sourceroot: Path, classpath: List[Path]) {
-    private val META_INF = Paths.get("META-INF", "semanticdb")
+    private val META_INF = Paths.get("META-INF", "semanticdb").resolve(buildSubFolder)
     private val classLoader = new java.net.URLClassLoader(classpath.map(_.toUri.toURL).toArray)
     /** Returns a SemanticDB for a single Scala source file, if any. The path must be absolute. */
     def resolve(scalaAbsolutePath: Path): Option[s.TextDocument] = {
@@ -43,7 +43,7 @@ object Semanticdbs {
       scalaRelativePath: Path,
       semanticdbAbsolutePath: Path
   ): s.TextDocument = {
-    val reluri = scalaRelativePath.iterator.asScala.mkString("/")
+    val reluri = buildSubFolder + scalaRelativePath.iterator.asScala.mkString("/")
     val sdocs = parseTextDocuments(semanticdbAbsolutePath)
     sdocs.documents.find(_.uri == reluri) match {
       case None => throw new NoSuchElementException(reluri)