Skip to content

Commit 22b9d17

Browse files
committed
fix
1 parent 82a2a87 commit 22b9d17

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

src/cm/lsp/serverLauncher.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const STATUS_PRESENT = "present";
1010
const STATUS_DECLINED = "declined";
1111
const STATUS_FAILED = "failed";
1212

13-
const AXS_BINARY = "$PREFIX/new_axs";
13+
const AXS_BINARY = "$PREFIX/axs";
1414

1515
function getExecutor() {
1616
const executor = globalThis.Executor;

src/cm/lsp/serverRegistry.js

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ function registerBuiltinServers() {
276276
command: "typescript-language-server",
277277
args: ["--stdio"],
278278
},
279-
checkCommand:
280-
'if [ -x "$PREFIX/new_axs" ]; then which typescript-language-server; else exit 1; fi',
279+
checkCommand: "which typescript-language-server",
281280
install: {
282281
command:
283282
"apk add --no-cache nodejs npm && npm install -g typescript-language-server typescript",
@@ -330,8 +329,7 @@ function registerBuiltinServers() {
330329
command: "vscode-html-language-server",
331330
args: ["--stdio"],
332331
},
333-
checkCommand:
334-
'if [ -x "$PREFIX/new_axs" ]; then which vscode-html-language-server; else exit 1; fi',
332+
checkCommand: "which vscode-html-language-server",
335333
install: {
336334
command:
337335
"apk add --no-cache nodejs npm && npm install -g vscode-langservers-extracted",
@@ -355,8 +353,7 @@ function registerBuiltinServers() {
355353
command: "vscode-css-language-server",
356354
args: ["--stdio"],
357355
},
358-
checkCommand:
359-
'if [ -x "$PREFIX/new_axs" ]; then which vscode-css-language-server; else exit 1; fi',
356+
checkCommand: "which vscode-css-language-server",
360357
install: {
361358
command:
362359
"apk add --no-cache nodejs npm && npm install -g vscode-langservers-extracted",
@@ -372,44 +369,19 @@ function registerBuiltinServers() {
372369
transport: {
373370
kind: "websocket",
374371
url: "ws://127.0.0.1:2093",
375-
},
376-
launcher: {
377-
bridge: {
378-
kind: "axs",
379-
port: 2093,
380-
command: "vscode-json-language-server",
381-
args: ["--stdio"],
382-
},
383-
checkCommand:
384-
'if [ -x "$PREFIX/new_axs" ]; then which vscode-json-language-server; else exit 1; fi',
385-
install: {
386-
command:
387-
"apk add --no-cache nodejs npm && npm install -g vscode-langservers-extracted",
388-
prompt: "Install JSON language server dependencies?",
389-
},
390-
},
391-
enabled: false,
392-
},
393-
{
394-
id: "rust-analyzer",
395-
label: "Rust",
396-
languages: ["rust"],
397-
transport: {
398-
kind: "websocket",
399-
url: "ws://127.0.0.1:2094",
400372
},
401373
launcher: {
402374
bridge: {
403375
kind: "axs",
404-
port: 2094,
405-
command: "rust-analyzer",
376+
port: 2093,
377+
command: "vscode-json-language-server",
406378
args: ["--stdio"],
407379
},
408-
checkCommand:
409-
'if [ -x "$PREFIX/new_axs" ]; then which rust-analyzer; else exit 1; fi',
380+
checkCommand: "which vscode-json-language-server",
410381
install: {
411-
command: "apk add --no-cache rust-analyzer",
412-
prompt: "Install rust-analyzer language server?",
382+
command:
383+
"apk add --no-cache nodejs npm && npm install -g vscode-langservers-extracted",
384+
prompt: "Install JSON language server dependencies?",
413385
},
414386
},
415387
enabled: false,

0 commit comments

Comments
 (0)