From 5a0a823671a85ea6b5f8f94b77dea8adb3ffc619 Mon Sep 17 00:00:00 2001
From: Jeroen Van Antwerpen <JVA@domain.ompartners.com>
Date: Fri, 15 Nov 2024 12:11:59 +0000
Subject: [PATCH] Revert "Revert #708 and #715, and release 0.1.31 (#724)"

This reverts commit 0cda54a8d8a359be656e5f09a9facbe4c6b2b663.
---
 CHANGELOG.md          | 5 -----
 package-lock.json     | 6 +++---
 package.json          | 4 ++--
 src/clangd-context.ts | 6 ++++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d2344..8d4e850 100644
--- 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
index 11fa3d3..db76562 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "vscode-clangd",
-    "version": "0.1.31",
+    "version": "0.1.30",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "vscode-clangd",
-            "version": "0.1.31",
+            "version": "0.1.30",
             "license": "MIT",
             "dependencies": {
                 "@clangd/install": "0.1.17",
@@ -5848,4 +5848,4 @@
             "dev": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b92d3d7..1923d11 100644
--- 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 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/clangd-context.ts b/src/clangd-context.ts
index 51beadb..eaa216f 100644
--- 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) {