From 0cda54a8d8a359be656e5f09a9facbe4c6b2b663 Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Wed, 13 Nov 2024 17:10:46 -0500
Subject: [PATCH] Revert #708 and #715, and release 0.1.31 (#724)

This reverts commits 4f64ca7d426e36620164a635f679659d471f21a4 (#715) and 0c2d40d7d6b8092309bd2c880a32e59c71472a80 (#708).
---
 CHANGELOG.md          | 5 +++++
 package-lock.json     | 6 +++---
 package.json          | 4 ++--
 src/clangd-context.ts | 6 ++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d4e850..c0d2344 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 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 db76562..11fa3d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "vscode-clangd",
-    "version": "0.1.30",
+    "version": "0.1.31",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "vscode-clangd",
-            "version": "0.1.30",
+            "version": "0.1.31",
             "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 1923d11..b92d3d7 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.30",
+    "version": "0.1.31",
     "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 eaa216f..51beadb 100644
--- a/src/clangd-context.ts
+++ b/src/clangd-context.ts
@@ -67,11 +67,9 @@ export class ClangdContext implements vscode.Disposable {
       return;
 
     const clangd: vscodelc.Executable = {
-      // Quote the path. With `shell: true`, this is needed
-      // in case the path contains spaces.
-      command: `"${clangdPath}"`,
+      command: clangdPath,
       args: await config.get<string[]>('arguments'),
-      options: {cwd: vscode.workspace.rootPath || process.cwd(), shell: true}
+      options: {cwd: vscode.workspace.rootPath || process.cwd()}
     };
     const traceFile = config.get<string>('trace');
     if (!!traceFile) {