Merge pull request #352 from lwronski/fix-code-lens-vscode

Fix code lens in VSCode
VirtusLab · Nov 6, 2021 · a1a7c43 · a1a7c43
2 parents cce4f49 + 94acaa0
commit a1a7c43
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/modules/bloop-rifle/src/main/scala/scala/build/bloop/BuildServer.scala b/modules/bloop-rifle/src/main/scala/scala/build/bloop/BuildServer.scala
@@ -2,7 +2,5 @@ package scala.build.bloop
 
 import ch.epfl.scala.bsp4j
 
-import scala.build.bsp.ScalaDebugServer
-
 trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer
     with ScalaDebugServer
diff --git a/modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServer.scala b/modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServer.scala
@@ -1,4 +1,4 @@
-package scala.build.bsp;
+package scala.build.bloop;
 
 import ch.epfl.scala.bsp4j.{DebugSessionAddress, DebugSessionParams}
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest

diff --git a/modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServerForwardStubs.scala b/modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServerForwardStubs.scala
@@ -1,4 +1,4 @@
-package scala.build.bsp
+package scala.build.bloop
 
 import ch.epfl.scala.{bsp4j => b}
 

diff --git a/modules/build/src/main/scala/scala/build/bsp/BspServer.scala b/modules/build/src/main/scala/scala/build/bsp/BspServer.scala
@@ -5,6 +5,7 @@ import ch.epfl.scala.{bsp4j => b}
 import java.util.concurrent.CompletableFuture
 
 import scala.build.Logger
+import scala.build.bloop.{ScalaDebugServer, ScalaDebugServerForwardStubs}
 import scala.build.internal.Constants
 import scala.build.options.Scope
 import scala.concurrent.{Future, Promise}

diff --git a/...i/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/proxy-config.json b/...i/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/proxy-config.json
@@ -6,5 +6,13 @@
   [
     "scala.build.bloop.BuildServer",
     "org.eclipse.lsp4j.jsonrpc.Endpoint"
+  ],
+  [
+    "scala.build.bloop.ScalaDebugServer",
+    "org.eclipse.lsp4j.jsonrpc.Endpoint"
+  ],
+  [
+    "scala.build.bloop.ScalaDebugServerForwardStubs",
+    "org.eclipse.lsp4j.jsonrpc.Endpoint"
   ]
 ]
diff --git a/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json b/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
@@ -703,6 +703,20 @@
     "allDeclaredMethods": true,
     "allDeclaredFields": true
   },
+  {
+    "name": "scala.build.bloop.ScalaDebugServer",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
+  {
+    "name": "scala.build.bloop.ScalaDebugServerForwardStubs",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allDeclaredFields": true
+  },
   {
     "name": "scala.build.bloop.bloop4j.BloopExtraBuildParams",
     "allDeclaredConstructors": true,

diff --git a/modules/cli/src/main/scala/scala/cli/commands/SetupIde.scala b/modules/cli/src/main/scala/scala/cli/commands/SetupIde.scala
@@ -116,7 +116,11 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
     }
 
     val inputArgs = inputs.elements.collect {
-      case d: Inputs.OnDisk => d.path.toString
+      case d: Inputs.OnDisk =>
+        val path = d.path
+        if (os.isFile(path))
+          path.toString().stripSuffix(s"${path.last}")
+        else path.toString
     }
 
     val bspArgs =

diff --git a/modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala
@@ -225,7 +225,7 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
         "bsp",
         "--json-options",
         (root / "directory" / ".scala" / "ide-options.json").toString,
-        (root / "directory" / "simple.sc").toString
+        s"${(root / "directory").toString}/"
       )
       expect(details.argv == expectedArgv)
     }