Revert "Revert clangd#708 and clangd#715, and release 0.1.31 (clangd#724

)" This reverts commit 0cda54a.
JVApen · Nov 15, 2024 · 5a0a823 · 5a0a823
1 parent 0cda54a
commit 5a0a823
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,5 @@
 # Change Log
 
-## Version 0.1.31: November 13, 2024
-
-* Reverted [#708](https://github.com/clangd/vscode-clangd/pull/708) and [#715](https://github.com/clangd/vscode-clangd/pull/715) for causing [#722](https://github.com/clangd/vscode-clangd/issues/722)
-
-
 ## Version 0.1.30: November 13, 2024
 
 * Added option to disable hovers [#703](https://github.com/clangd/vscode-clangd/pull/703)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-clangd",
     "displayName": "clangd",
     "description": "C/C++ completion, navigation, and insights",
-    "version": "0.1.31",
+    "version": "0.1.30",
     "publisher": "llvm-vs-code-extensions",
     "license": "MIT",
     "homepage": "https://clangd.llvm.org/",
@@ -397,4 +397,4 @@
             ]
         }
     }
-}
+}
diff --git a/src/clangd-context.ts b/src/clangd-context.ts
@@ -67,9 +67,11 @@ export class ClangdContext implements vscode.Disposable {
       return;
 
     const clangd: vscodelc.Executable = {
-      command: clangdPath,
+      // Quote the path. With `shell: true`, this is needed
+      // in case the path contains spaces.
+      command: `"${clangdPath}"`,
       args: await config.get<string[]>('arguments'),
-      options: {cwd: vscode.workspace.rootPath || process.cwd()}
+      options: {cwd: vscode.workspace.rootPath || process.cwd(), shell: true}
     };
     const traceFile = config.get<string>('trace');
     if (!!traceFile) {