added quotes for Windows paths with spaces

AlexHaxe · Oct 22, 2024 · 9fac603 · 9fac603
1 parent 39a6c1d
commit 9fac603
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/eval-debugger b/eval-debugger
diff --git a/server b/server
diff --git a/src/vshaxe/configuration/HaxeExecutable.hx b/src/vshaxe/configuration/HaxeExecutable.hx
@@ -3,6 +3,7 @@ package vshaxe.configuration;
 import haxe.DynamicAccess;
 import haxe.extern.EitherType;
 import haxe.io.Path;
+import haxeLanguageServer.ProcessUtil.shellEscapeCommand;
 import js.node.Buffer;
 import js.node.ChildProcess;
 import sys.FileSystem;
@@ -108,6 +109,7 @@ class HaxeExecutable extends ConfigurationWrapper<HaxeExecutableConfiguration> {
 				}
 			}
 		}
+		executable = shellEscapeCommand(executable);
 
 		configuration = {
 			executable: executable,

diff --git a/src/vshaxe/configuration/HaxeInstallation.hx b/src/vshaxe/configuration/HaxeInstallation.hx
@@ -3,6 +3,7 @@ package vshaxe.configuration;
 import haxe.DynamicAccess;
 import haxe.Timer;
 import haxe.io.Path;
+import haxeLanguageServer.ProcessUtil.shellEscapeCommand;
 import sys.FileSystem;
 import vshaxe.helper.PathHelper;
 import vshaxe.helper.ProcessHelper;
@@ -189,7 +190,8 @@ class HaxeInstallation {
 	}
 
 	function getLibraryBasePath():Null<String> {
-		final output = getProcessOutput('${haxelib.configuration.executable} config')[0];
+		final haxelibExe = shellEscapeCommand(haxelib.configuration.executable);
+		final output = getProcessOutput('$haxelibExe config')[0];
 		return if (output == null) {
 			trace("`haxelib config` call failed, Haxe Dependencies won't be populated.");
 			null;

diff --git a/src/vshaxe/helper/HaxeConfiguration.hx b/src/vshaxe/helper/HaxeConfiguration.hx
@@ -3,6 +3,7 @@ package vshaxe.helper;
 import haxe.Json;
 import haxe.ds.ReadOnlyArray;
 import haxe.io.Path;
+import haxeLanguageServer.ProcessUtil.shellEscapeCommand;
 import js.lib.Promise;
 import sys.FileSystem;
 import sys.io.File;
@@ -292,7 +293,7 @@ class HaxeConfiguration {
 
 	function resolveHaxelibs(libs:ReadOnlyArray<String>):Array<String> {
 		final hxml = [];
-		final haxelib = haxeInstallation.haxelib.configuration.executable;
+		final haxelib = shellEscapeCommand(haxeInstallation.haxelib.configuration.executable);
 		final output = getProcessOutput('$haxelib path ${libs.join(" ")}');
 		for (line in output) {
 			line = line.trim();
+4 −4		haxe_libraries/formatter.hxml
+3 −3		haxe_libraries/rename.hxml
+3 −3		haxe_libraries/tokentree.hxml
+13 −0		makePackage.sh
+2 −2		package-lock.json
+11 −2		package.json
+14 −0		shared/haxeLanguageServer/ProcessUtil.hx
+3 −3		src/haxeLanguageServer/Configuration.hx
+3 −1		src/haxeLanguageServer/features/haxe/DiagnosticsFeature.hx
+7 −7		src/haxeLanguageServer/features/haxe/InlayHintFeature.hx
+51 −4		src/haxeLanguageServer/features/haxe/codeAction/OrganizeImportsFeature.hx
+4 −2		src/haxeLanguageServer/server/HaxeServer.hx