summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bsp/.bsp/mill-bsp.json18
-rw-r--r--contrib/bsp/src/mill/contrib/MainMillBuildServer.scala12
2 files changed, 0 insertions, 30 deletions
diff --git a/contrib/bsp/.bsp/mill-bsp.json b/contrib/bsp/.bsp/mill-bsp.json
deleted file mode 100644
index 01b08e07..00000000
--- a/contrib/bsp/.bsp/mill-bsp.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "mill-bsp",
- "argv": [
- "java",
- "-DMILL_CLASSPATH=/usr/local/bin/mill",
- "-DMILL_VERSION=0.4.0",
- "-Djna.nosys=true",
- "-cp",
- "/usr/local/bin/mill",
- "mill.MillMain mill.contrib.MainMillBuildServer/startServer"
- ],
- "version": "1.0.0",
- "bspVersion": "2.0.0-M4",
- "languages": [
- "scala",
- "java"
- ]
-} \ No newline at end of file
diff --git a/contrib/bsp/src/mill/contrib/MainMillBuildServer.scala b/contrib/bsp/src/mill/contrib/MainMillBuildServer.scala
index b5b9748a..af5483a4 100644
--- a/contrib/bsp/src/mill/contrib/MainMillBuildServer.scala
+++ b/contrib/bsp/src/mill/contrib/MainMillBuildServer.scala
@@ -7,10 +7,8 @@ import java.util.concurrent.Executors
import upickle.default._
import ch.epfl.scala.bsp4j._
import mill._
-import mill.contrib.bsp.ModuleUtils
import mill.define.{Command, Discover, ExternalModule}
import mill.eval.Evaluator
-import mill.scalalib.JavaModule
import org.eclipse.lsp4j.jsonrpc.Launcher
import scala.collection.JavaConverters._
@@ -78,7 +76,6 @@ object BSP extends ExternalModule {
println("The bsp connection json file probably exists already - will be overwritten")
os.remove(bspDirectory / "mill.json")
os.write(bspDirectory / "mill.json", Json.stringify(createBspConnectionJson()))
- //TODO: Do I want to catch this or throw the exception?
case e: Exception => println("An exception occurred while installing mill-bsp: " + e.getMessage +
" " + e.getStackTrace.toString)
}
@@ -126,13 +123,4 @@ object BSP extends ExternalModule {
executor.shutdown()
}
}
-
- def experiment(ev: Evaluator): Command[Unit] = T.command {
- val eval = new Evaluator(ev.home, ev.outPath, ev.externalOutPath, ev.rootModule, ev.log, ev.classLoaderSig,
- ev.workerCache, ev.env, false)
- val millServer = new mill.contrib.bsp.MillBuildServer(eval, bspVersion, version, languages)
-
- millServer.initialized = true
- println(millServer.workspaceBuildTargets().get)
- }
} \ No newline at end of file