Skip to content

Commit 065fc6a

Browse files
committed
fix(lsp): improve custom server transport setup
1 parent b463c92 commit 065fc6a

35 files changed

+599
-118
lines changed

src/cm/lsp/transport.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,10 @@ function createStdioTransport(
344344
`LSP server ${server.id} is missing transport configuration`,
345345
);
346346
}
347-
if (!server.transport.url) {
347+
if (
348+
!server.transport.url &&
349+
!(context.dynamicPort && context.dynamicPort > 0)
350+
) {
348351
throw new Error(
349352
`STDIO transport for ${server.id} is missing a websocket bridge url`,
350353
);

src/lang/ar-ye.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,5 +705,15 @@
705705
"pinned tab": "Pinned tab",
706706
"unpin tab before closing": "Unpin the tab before closing it.",
707707
"app font": "App font",
708-
"settings-info-app-font-family": "Choose the font used across the app interface."
708+
"settings-info-app-font-family": "Choose the font used across the app interface.",
709+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
710+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
711+
"lsp-websocket-url": "WebSocket URL",
712+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
713+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
714+
"lsp-error-websocket-url-required": "WebSocket URL is required",
715+
"lsp-remove-custom-server": "Remove custom server",
716+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
717+
"lsp-custom-server-removed": "Custom server removed",
718+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
709719
}

src/lang/be-by.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,5 +707,15 @@
707707
"pinned tab": "Pinned tab",
708708
"unpin tab before closing": "Unpin the tab before closing it.",
709709
"app font": "App font",
710-
"settings-info-app-font-family": "Choose the font used across the app interface."
710+
"settings-info-app-font-family": "Choose the font used across the app interface.",
711+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
712+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
713+
"lsp-websocket-url": "WebSocket URL",
714+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
715+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
716+
"lsp-error-websocket-url-required": "WebSocket URL is required",
717+
"lsp-remove-custom-server": "Remove custom server",
718+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
719+
"lsp-custom-server-removed": "Custom server removed",
720+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
711721
}

src/lang/bn-bd.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,5 +706,15 @@
706706
"pinned tab": "Pinned tab",
707707
"unpin tab before closing": "Unpin the tab before closing it.",
708708
"app font": "App font",
709-
"settings-info-app-font-family": "Choose the font used across the app interface."
709+
"settings-info-app-font-family": "Choose the font used across the app interface.",
710+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
711+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
712+
"lsp-websocket-url": "WebSocket URL",
713+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
714+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
715+
"lsp-error-websocket-url-required": "WebSocket URL is required",
716+
"lsp-remove-custom-server": "Remove custom server",
717+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
718+
"lsp-custom-server-removed": "Custom server removed",
719+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
710720
}

src/lang/cs-cz.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,5 +706,15 @@
706706
"pinned tab": "Pinned tab",
707707
"unpin tab before closing": "Unpin the tab before closing it.",
708708
"app font": "App font",
709-
"settings-info-app-font-family": "Choose the font used across the app interface."
709+
"settings-info-app-font-family": "Choose the font used across the app interface.",
710+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
711+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
712+
"lsp-websocket-url": "WebSocket URL",
713+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
714+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
715+
"lsp-error-websocket-url-required": "WebSocket URL is required",
716+
"lsp-remove-custom-server": "Remove custom server",
717+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
718+
"lsp-custom-server-removed": "Custom server removed",
719+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
710720
}

src/lang/de-de.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,5 +706,15 @@
706706
"pinned tab": "Pinned tab",
707707
"unpin tab before closing": "Unpin the tab before closing it.",
708708
"app font": "App font",
709-
"settings-info-app-font-family": "Choose the font used across the app interface."
709+
"settings-info-app-font-family": "Choose the font used across the app interface.",
710+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
711+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
712+
"lsp-websocket-url": "WebSocket URL",
713+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
714+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
715+
"lsp-error-websocket-url-required": "WebSocket URL is required",
716+
"lsp-remove-custom-server": "Remove custom server",
717+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
718+
"lsp-custom-server-removed": "Custom server removed",
719+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
710720
}

src/lang/en-us.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,10 @@
568568
"lsp-invalid-timeout": "Invalid timeout value",
569569
"lsp-language-ids": "Language IDs (comma separated)",
570570
"lsp-packages-prompt": "{method} packages (comma separated)",
571+
"lsp-remove-custom-server": "Remove custom server",
572+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
571573
"lsp-remove-installed-files": "Remove installed files for {server}?",
574+
"lsp-custom-server-removed": "Custom server removed",
572575
"lsp-server-disabled-toast": "Server disabled",
573576
"lsp-server-enabled-toast": "Server enabled",
574577
"lsp-server-id": "Server ID",
@@ -587,12 +590,18 @@
587590
"lsp-status-not-installed": "Not installed",
588591
"lsp-status-unknown": "Unknown",
589592
"lsp-timeout-ms": "{timeout} ms",
593+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
594+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
590595
"lsp-uninstall-command-unavailable": "Uninstall command not available",
591596
"lsp-uninstall-server": "Uninstall server",
592597
"lsp-update-command-optional": "Update command (optional)",
593598
"lsp-update-command-unavailable": "Update command not available",
594599
"lsp-update-server": "Update server",
595600
"lsp-version-line": "Version: {version}",
601+
"lsp-websocket-url": "WebSocket URL",
602+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
603+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
604+
"lsp-error-websocket-url-required": "WebSocket URL is required",
596605
"lsp-view-initialization-options": "View initialization options",
597606
"settings-category-about-acode": "About Acode",
598607
"settings-category-advanced": "Advanced",
@@ -668,6 +677,7 @@
668677
"settings-info-lsp-add-custom-server": "Register a custom language server with install, update, and launch commands.",
669678
"settings-info-lsp-edit-init-options": "Edit initialization options as JSON.",
670679
"settings-info-lsp-install-server": "Install or repair this language server.",
680+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode.",
671681
"settings-info-lsp-server-enabled": "Enable or disable this language server.",
672682
"settings-info-lsp-startup-timeout": "Set how long Acode waits for the server to start.",
673683
"settings-info-lsp-uninstall-server": "Remove installed packages or binaries for this server.",

src/lang/es-sv.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,5 +706,15 @@
706706
"pinned tab": "Pinned tab",
707707
"unpin tab before closing": "Unpin the tab before closing it.",
708708
"app font": "App font",
709-
"settings-info-app-font-family": "Choose the font used across the app interface."
709+
"settings-info-app-font-family": "Choose the font used across the app interface.",
710+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
711+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
712+
"lsp-websocket-url": "WebSocket URL",
713+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
714+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
715+
"lsp-error-websocket-url-required": "WebSocket URL is required",
716+
"lsp-remove-custom-server": "Remove custom server",
717+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
718+
"lsp-custom-server-removed": "Custom server removed",
719+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
710720
}

src/lang/fr-fr.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,5 +706,15 @@
706706
"pinned tab": "Pinned tab",
707707
"unpin tab before closing": "Unpin the tab before closing it.",
708708
"app font": "App font",
709-
"settings-info-app-font-family": "Choose the font used across the app interface."
709+
"settings-info-app-font-family": "Choose the font used across the app interface.",
710+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
711+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
712+
"lsp-websocket-url": "WebSocket URL",
713+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
714+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
715+
"lsp-error-websocket-url-required": "WebSocket URL is required",
716+
"lsp-remove-custom-server": "Remove custom server",
717+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
718+
"lsp-custom-server-removed": "Custom server removed",
719+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
710720
}

src/lang/he-il.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,5 +707,15 @@
707707
"pinned tab": "Pinned tab",
708708
"unpin tab before closing": "Unpin the tab before closing it.",
709709
"app font": "App font",
710-
"settings-info-app-font-family": "Choose the font used across the app interface."
710+
"settings-info-app-font-family": "Choose the font used across the app interface.",
711+
"lsp-transport-method-stdio": "STDIO (launch a binary command)",
712+
"lsp-transport-method-websocket": "WebSocket (connect to a ws/wss URL)",
713+
"lsp-websocket-url": "WebSocket URL",
714+
"lsp-websocket-server-managed-externally": "This server is managed externally over WebSocket.",
715+
"lsp-error-websocket-url-invalid": "WebSocket URL must start with ws:// or wss://",
716+
"lsp-error-websocket-url-required": "WebSocket URL is required",
717+
"lsp-remove-custom-server": "Remove custom server",
718+
"lsp-remove-custom-server-confirm": "Remove custom language server {server}?",
719+
"lsp-custom-server-removed": "Custom server removed",
720+
"settings-info-lsp-remove-custom-server": "Remove this custom language server from Acode."
711721
}

0 commit comments

Comments
 (0)