diff options
author | Alexandra Dima <alexandra.dima@jetbrains.com> | 2019-07-23 18:02:12 +0200 |
---|---|---|
committer | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:33:09 +0200 |
commit | fca29d647f2ae0b71c5b66b3ea4462987e08c911 (patch) | |
tree | 75cb532909d7756b6b1ed568a3924af086753661 /contrib | |
parent | f0bcc011d7592db9b6e2fc19648c8fb3c7dd3c9d (diff) | |
download | mill-fca29d647f2ae0b71c5b66b3ea4462987e08c911.tar.gz mill-fca29d647f2ae0b71c5b66b3ea4462987e08c911.tar.bz2 mill-fca29d647f2ae0b71c5b66b3ea4462987e08c911.zip |
Removed unnecessary directories and reverted the scratch folder to how it was in the original mill repo.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/bsp/.bsp/mill-bsp.json | 18 | ||||
-rw-r--r-- | contrib/bsp/src/mill/contrib/MainMillBuildServer.scala | 12 |
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 |