Merge pull request #2812 from Giggiux/fix-missing-buildtarget-error-d…

…ebugger Fix error for remote debugging when missing build target
scalameta · May 21, 2021 · 10c680a · 10c680a
2 parents b1c37db + 033a93d
commit 10c680a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/debug/BuildTargetClassesFinder.scala b/metals/src/main/scala/scala/meta/internal/metals/debug/BuildTargetClassesFinder.scala
@@ -143,6 +143,9 @@ class BuildTargetClassesFinder(
 case class BuildTargetNotFoundException(buildTargetName: String)
     extends Exception(s"Build target not found: $buildTargetName")
 
+case class BuildTargetUndefinedException()
+    extends Exception("Debugger configuration is missing 'buildTarget' param.")
+
 case class ClassNotFoundInBuildTargetException(
     className: String,
     buildTarget: b.BuildTarget

diff --git a/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala
@@ -393,8 +393,8 @@ class DebugProvider(
 
   def resolveAttachRemoteParams(
       params: DebugUnresolvedAttachRemoteParams
-  ): Future[b.DebugSessionParams] =
-    buildTargets.findByDisplayName(params.buildTarget) match {
+  )(implicit ec: ExecutionContext): Future[b.DebugSessionParams] = {
+    val result = buildTargets.findByDisplayName(params.buildTarget) match {
       case Some(target) =>
         Future.successful(
           new b.DebugSessionParams(
@@ -404,8 +404,11 @@ class DebugProvider(
           )
         )
       case None =>
-        Future.failed(new ju.NoSuchElementException(params.buildTarget))
+        Future.failed(BuildTargetUndefinedException())
     }
+    result.failed.foreach(reportErrors)
+    result
+  }
 
   private val reportErrors: PartialFunction[Throwable, Unit] = {
     case _ if buildClient.buildHasErrors =>
@@ -440,6 +443,10 @@ class DebugProvider(
       languageClient.showMessage(
         Messages.errorMessageParams(e.getMessage())
       )
+    case e: BuildTargetUndefinedException =>
+      languageClient.showMessage(
+        Messages.errorMessageParams(e.getMessage())
+      )
     case e: NoTestsFoundException =>
       languageClient.showMessage(
         Messages.errorMessageParams(e.getMessage())