From 711878a18a72322e641a7bd123381aad1a96d08c Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Tue, 3 Sep 2024 13:29:22 +0200 Subject: [PATCH] bugfix: Check if locally available sbt is actually a file --- .../main/scala/scala/meta/internal/builds/SbtBuildTool.scala | 2 +- tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala b/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala index 53a8e6f43e5..fbb996a8a85 100644 --- a/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala +++ b/metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala @@ -104,7 +104,7 @@ case class SbtBuildTool( val allPaths = projectRoot :: envPaths.map(AbsolutePath(_)) allPaths.collectFirst { path => path.resolve("sbt") match { - case sbtPath if sbtPath.exists => sbtPath.toString() + case sbtPath if sbtPath.exists && sbtPath.isFile => sbtPath.toString() } } } diff --git a/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala b/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala index 47e40e1ee0d..516fc0bc51f 100644 --- a/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala +++ b/tests/slow/src/test/scala/tests/sbt/SbtBloopLspSuite.scala @@ -47,6 +47,8 @@ class SbtBloopLspSuite test("basic") { cleanWorkspace() + // directory should not be used as sbt script + workspace.resolve("sbt").createDirectories() for { _ <- initialize( s"""|/project/build.properties