Fix absolute build directories

mesonbuild · Nov 23, 2023 · a6d44ce · a6d44ce
1 parent d7594cc
commit a6d44ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## next
 
 - Bump Swift-MesonLSP to v3.1.3
+- Fix absolute build directories
 
 ## 1.18.1
 

diff --git a/src/extension.ts b/src/extension.ts
@@ -10,7 +10,7 @@ import {
   clearCache,
   checkMesonIsConfigured,
   getOutputChannel,
-  relativeBuildDir,
+  getBuildDirectory,
   rootMesonFiles,
 } from "./utils";
 import { DebugConfigurationProviderCppdbg } from "./debug/cppdbg";
@@ -57,7 +57,7 @@ export async function activate(ctx: vscode.ExtensionContext) {
 
   const mesonFile = savedMesonFile ?? mesonFiles[0].fsPath;
   const sourceDir = dirname(mesonFile);
-  const buildDir = relativeBuildDir(mesonFile);
+  const buildDir = getBuildDirectory(sourceDir);
 
   workspaceState.update("mesonbuild.mesonFile", mesonFile);
   workspaceState.update("mesonbuild.buildDir", buildDir);

diff --git a/src/utils.ts b/src/utils.ts
@@ -57,9 +57,11 @@ export function extensionRelative(filepath: string) {
   return path.join(extensionPath, filepath);
 }
 
-export function relativeBuildDir(mesonFile: string) {
+export function getBuildDirectory(sourceDir: string) {
   const buildDir = extensionConfiguration("buildFolder");
-  return path.join(path.dirname(mesonFile), buildDir);
+  if (path.isAbsolute(buildDir)) return buildDir;
+
+  return path.join(sourceDir, buildDir);
 }
 
 let _layoutPromise: Promise<string> | null = null;