diff options
| author | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:14:22 +0200 |
|---|---|---|
| committer | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:33:20 +0200 |
| commit | d0070ee49aca7c9e8e757448d47ee51643d7a037 (patch) | |
| tree | de706562e5fdc9b6bc79e63b351584fbb78817cc /contrib | |
| parent | ebdb22edadd30f963abc48a178f09895cee412e3 (diff) | |
| download | mill-d0070ee49aca7c9e8e757448d47ee51643d7a037.tar.gz mill-d0070ee49aca7c9e8e757448d47ee51643d7a037.tar.bz2 mill-d0070ee49aca7c9e8e757448d47ee51643d7a037.zip | |
Fix formatting issues
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bsp/src/mill/contrib/BSP.scala | 14 | ||||
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/BspLoggedReporter.scala | 6 | ||||
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala | 9 |
3 files changed, 17 insertions, 12 deletions
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala index 0758faf4..5334f509 100644 --- a/contrib/bsp/src/mill/contrib/BSP.scala +++ b/contrib/bsp/src/mill/contrib/BSP.scala @@ -60,8 +60,9 @@ 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", createBspConnectionJson()) - case e: Exception => println("An exception occurred while installing mill-bsp: " + e.getMessage + - " " + e.getStackTrace.toString) + case e: Exception => + println("An exception occurred while installing mill-bsp") + e.printStackTrace() } } @@ -70,11 +71,14 @@ object BSP extends ExternalModule { def createBspConnectionJson(): String = { val millPath = scala.sys.props("MILL_CLASSPATH") write(BspConfigJson("mill-bsp", - List(whichJava, "-DMILL_CLASSPATH=" + millPath, + List(whichJava, + "-DMILL_CLASSPATH=" + millPath, s"-DMILL_VERSION=${scala.sys.props("MILL_VERSION")}", - "-Djna.nosys=true", "-cp", + "-Djna.nosys=true", + "-cp", millPath, - "mill.MillMain", "mill.contrib.BSP/start"), + "mill.MillMain", + "mill.contrib.BSP/start"), version, bspVersion, languages)) diff --git a/contrib/bsp/src/mill/contrib/bsp/BspLoggedReporter.scala b/contrib/bsp/src/mill/contrib/bsp/BspLoggedReporter.scala index 3e65b648..d1b9a66b 100644 --- a/contrib/bsp/src/mill/contrib/bsp/BspLoggedReporter.scala +++ b/contrib/bsp/src/mill/contrib/bsp/BspLoggedReporter.scala @@ -65,7 +65,8 @@ class BspLoggedReporter(client: bsp.BuildClient, }) val params = new bsp.PublishDiagnosticsParams(textDocument, targetId, - appendDiagnostics(textDocument, diagnostic).asJava, + appendDiagnostics(textDocument, + diagnostic).asJava, true) if (originId.nonEmpty) { @@ -94,7 +95,8 @@ class BspLoggedReporter(client: bsp.BuildClient, println(i) val start = new bsp.Position( pos.startLine.orElse(pos.line).getOrElse[Int](0), - pos.startOffset.orElse(pos.offset).getOrElse[Int](0)) + pos.startOffset.orElse(pos.offset).getOrElse[Int](0) + ) val end = new bsp.Position( pos.endLine.orElse(pos.line).getOrElse[Int](start.getLine.intValue()), pos.endOffset.orElse(pos.offset).getOrElse[Int](start.getCharacter.intValue())) diff --git a/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala b/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala index 922e26eb..b49c0b7c 100644 --- a/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala +++ b/contrib/bsp/src/mill/contrib/bsp/BspTestReporter.scala @@ -21,11 +21,10 @@ import sbt.testing._ * in case special arguments need to be passed to * the compiler before running the test task. */ -class BspTestReporter( - client: BuildClient, - targetId: BuildTargetIdentifier, - taskId: TaskId, - arguments: Seq[String]) extends TestReporter { +class BspTestReporter(client: BuildClient, + targetId: BuildTargetIdentifier, + taskId: TaskId, + arguments: Seq[String]) extends TestReporter { var passed = 0 var failed = 0 |