diff options
| author | Alexandra Dima <alexandra.dima@jetbrains.com> | 2019-07-11 13:18:12 +0200 |
|---|---|---|
| committer | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-12 14:33:00 +0200 |
| commit | cf2ddf2f9da40007847ca69dc521098727b98f6d (patch) | |
| tree | d33fa711bb81b9e72a660f93c443e2b8500bec94 /contrib | |
| parent | 8287563ea4ee743a483dc6c1e4f25dd219a11e59 (diff) | |
| download | mill-cf2ddf2f9da40007847ca69dc521098727b98f6d.tar.gz mill-cf2ddf2f9da40007847ca69dc521098727b98f6d.tar.bz2 mill-cf2ddf2f9da40007847ca69dc521098727b98f6d.zip | |
Fixed bugs in getting target capabilities and dependencies.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala | 3 | ||||
| -rw-r--r-- | contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala index 59ac8e57..3a694599 100644 --- a/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala +++ b/contrib/bsp/src/mill/contrib/bsp/MillBuildServer.scala @@ -182,6 +182,9 @@ class MillBuildServer(evaluator: Evaluator, Agg.empty[PathRef]) ++ evaluateInformativeTask(evaluator, millModule.resolveDeps(millModule.compileIvyDeps), + Agg.empty[PathRef]) ++ + evaluateInformativeTask(evaluator, + millModule.unmanagedClasspath, Agg.empty[PathRef]) millModule match { case m: ScalaModule => sources ++= evaluateInformativeTask(evaluator, diff --git a/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala b/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala index a3202aab..1917f732 100644 --- a/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala +++ b/contrib/bsp/src/mill/contrib/bsp/ModuleUtils.scala @@ -65,11 +65,8 @@ object ModuleUtils { } def getModuleCapabilities(module: JavaModule, evaluator: Evaluator): BuildTargetCapabilities = { - val canRun = getTaskResult(evaluator, module.finalMainClassOpt) match { - case result: Result.Success[Any] => result.asSuccess.get.value match { - case _: Right[String, String] => true - case _: Left[String, String] => false - } + val canRun = getTaskResult(evaluator, module.finalMainClass) match { + case result: Result.Success[String] => true case default => false } val canTest = module match { |