Fix path to LSP server executables and NodeJS arm64 download url

Signed-off-by: Konstantin Zaitsev <[email protected]>
hcengineering · Dec 20, 2024 · 82c41d9 · 82c41d9
1 parent 3406892
commit 82c41d9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
diff --git a/plugins/hulylabs.langconfigurator/resources/lsp-templates/astro/template.yaml b/plugins/hulylabs.langconfigurator/resources/lsp-templates/astro/template.yaml
@@ -2,8 +2,8 @@ id: astro-language-server
 name: Astro Language Server
 
 programArgs:
-  default: "sh -c \"$APPLICATION_CONFIG_DIR$/lsp4ij/astro-language-server/node_modules/.bin/astro-ls --stdio\""
-  windows: "$APPLICATION_CONFIG_DIR$/lsp4ij/astro-language-server/node_modules/.bin/astro-ls.cmd --stdio"
+  default: "sh -c \"'$APPLICATION_CONFIG_DIR$/lsp4ij/astro-language-server/node_modules/.bin/astro-ls' --stdio\""
+  windows: "\"$APPLICATION_CONFIG_DIR$/lsp4ij/astro-language-server/node_modules/.bin/astro-ls.cmd\" --stdio"
 
 installNodeModules: ["@astrojs/language-server", "prettier", "prettier-plugin-astro"]
 

diff --git a/plugins/hulylabs.langconfigurator/resources/lsp-templates/rust-analyzer/template.yaml b/plugins/hulylabs.langconfigurator/resources/lsp-templates/rust-analyzer/template.yaml
@@ -2,8 +2,8 @@ id: rust-analyzer
 name: Rust Language Server
 
 programArgs:
-  default: "sh -c $APPLICATION_CONFIG_DIR$/lsp4ij/rust-analyzer/rust-analyzer"
-  windows: "$APPLICATION_CONFIG_DIR$/lsp4ij/rust-analyzer/rust-analyzer.exe"
+  default: "sh -c '$APPLICATION_CONFIG_DIR$/lsp4ij/rust-analyzer/rust-analyzer'"
+  windows: "\"$APPLICATION_CONFIG_DIR$/lsp4ij/rust-analyzer/rust-analyzer.exe\""
 
 binaryUrls:
   windows-x86_64: "https://github.com/rust-lang/rust-analyzer/releases/download/2024-12-09/rust-analyzer-x86_64-pc-windows-msvc.zip"

diff --git a/plugins/hulylabs.langconfigurator/resources/lsp-templates/svelte/template.yaml b/plugins/hulylabs.langconfigurator/resources/lsp-templates/svelte/template.yaml
@@ -2,8 +2,8 @@ id: svelte-language-server
 name: Svelte Language Server
 
 programArgs:
-  default: "sh -c \"$APPLICATION_CONFIG_DIR$/lsp4ij/svelte-language-server/node_modules/.bin/svelteserver --stdio\""
-  windows: "$APPLICATION_CONFIG_DIR$/lsp4ij/svelte-language-server/node_modules/.bin/svelteserver.cmd --stdio"
+  default: "sh -c \"'$APPLICATION_CONFIG_DIR$/lsp4ij/svelte-language-server/node_modules/.bin/svelteserver' --stdio\""
+  windows: "\"$APPLICATION_CONFIG_DIR$/lsp4ij/svelte-language-server/node_modules/.bin/svelteserver.cmd\" --stdio"
 
 installNodeModules: ["svelte-language-server"]
 

diff --git a/...ulylabs.langconfigurator/resources/lsp-templates/typescript-language-server/template.yaml b/...ulylabs.langconfigurator/resources/lsp-templates/typescript-language-server/template.yaml
@@ -2,8 +2,8 @@ id: typescript-language-server
 name: TypeScript Language Server
 
 programArgs:
-  default: "sh -c \"$APPLICATION_CONFIG_DIR$/lsp4ij/typescript-language-server/node_modules/.bin/typescript-language-server --stdio\""
-  windows: "$APPLICATION_CONFIG_DIR$/lsp4ij/typescript-language-server/node_modules/.bin/typescript-language-server.cmd --stdio"
+  default: "sh -c \"'$APPLICATION_CONFIG_DIR$/lsp4ij/typescript-language-server/node_modules/.bin/typescript-language-server' --stdio\""
+  windows: "\"$APPLICATION_CONFIG_DIR$/lsp4ij/typescript-language-server/node_modules/.bin/typescript-language-server.cmd\" --stdio"
 
 installNodeModules: ["typescript-language-server", "typescript"]
 

diff --git a/plugins/hulylabs.langconfigurator/resources/lsp-templates/zig-language-server/template.yaml b/plugins/hulylabs.langconfigurator/resources/lsp-templates/zig-language-server/template.yaml
@@ -2,8 +2,8 @@ id: zig-language-server
 name: ZIG Language Server
 
 programArgs:
-  default: "sh -c \"$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls --config-path $APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls.json\""
-  windows: "$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls --config-path $APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls.json"
+  default: "sh -c \"'$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls' --config-path '$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls.json'\""
+  windows: "\"$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls\" --config-path \"$APPLICATION_CONFIG_DIR$/lsp4ij/zig-language-server/zls.json\""
 
 binaryUrls:
   windows-x86_64: "https://github.com/zigtools/zls/releases/download/0.13.0/zls-x86_64-windows.zip"

diff --git a/...figurator/src/com/hulylabs/intellij/plugins/langconfigurator/nodejs/ManagedNodeRuntime.kt b/...figurator/src/com/hulylabs/intellij/plugins/langconfigurator/nodejs/ManagedNodeRuntime.kt
@@ -89,7 +89,7 @@ class ManagedNodeRuntime(private val installationPath: Path) : NodeRuntime() {
     suspend fun installIfNeeded(): NodeRuntime {
       LOG.info("Node runtime installIfNeeded")
       val os = if (SystemInfo.isWindows) "win" else (if (SystemInfo.isMac) "darwin" else (if (SystemInfo.isLinux) "linux" else null))
-      val arch = if (CpuArch.isArm64()) "aarch64" else (if (CpuArch.isIntel64()) "x64" else null)
+      val arch = if (CpuArch.isArm64()) "arm64" else (if (CpuArch.isIntel64()) "x64" else null)
 
       if (os == null || arch == null) {
         throw IOException("Unsupported platform")