Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/lang/ar-ye.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/be-by.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/bn-bd.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/cs-cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/de-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
Comment thread
bajrangCoder marked this conversation as resolved.
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/es-sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/fr-fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/he-il.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/hi-in.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/hu-hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} perce",
"day plural": "{count} napja",
"hour plural": "{count} órája",
"min plural": "{count} perce"
"min plural": "{count} perce",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/id-id.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} menit lalu",
"day plural": "{count} hari lalu",
"hour plural": "{count} jam lalu",
"min plural": "{count} menit lalu"
"min plural": "{count} menit lalu",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
2 changes: 2 additions & 0 deletions src/lang/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,8 @@ declare type LangStrings = {
"day plural": string;
"hour plural": string;
"min plural": string;
"settings-category-builtin-servers": string;
"settings-category-plugin-servers": string;
};

declare var strings: LangStrings;
4 changes: 3 additions & 1 deletion src/lang/ir-fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/it-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/ja-jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/ko-kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/ml-in.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/mm-unicode.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/mm-zawgyi.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/pl-pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/pu-in.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/ru-ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/tl-ph.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/tr-tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/uk-ua.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/uz-uz.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/vi-vn.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/zh-hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
4 changes: 3 additions & 1 deletion src/lang/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,7 @@
"min singular": "{count} minute ago",
"day plural": "{count} days ago",
"hour plural": "{count} hours ago",
"min plural": "{count} minutes ago"
"min plural": "{count} minutes ago",
"settings-category-builtin-servers": "Built-in servers",
"settings-category-plugin-servers": "Plugin servers"
}
61 changes: 41 additions & 20 deletions src/settings/lspSettings.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { quoteArg } from "cm/lsp/installRuntime";
import serverRegistry from "cm/lsp/serverRegistry";
import { builtinServers } from "cm/lsp/servers";
import settingsPage from "components/settingsPage";
import toast from "components/toast";
import prompt from "dialogs/prompt";
import select from "dialogs/select";
import appSettings from "lib/settings";
import {
getServerOverride,
isCustomServer,
normalizeLanguages,
normalizeServerId,
upsertCustomServer,
Expand Down Expand Up @@ -172,7 +174,10 @@ export default function lspSettings() {
const categories = {
customServers: strings["settings-category-custom-servers"],
behavior: strings["settings-category-behavior"] || "Behavior",
servers: strings["settings-category-servers"],
builtinServers:
strings["settings-category-builtin-servers"] || "Built-in servers",
pluginServers:
strings["settings-category-plugin-servers"] || "Plugin servers",
};
let page = createPage();

Expand Down Expand Up @@ -209,6 +214,38 @@ export default function lspSettings() {
return a.label.localeCompare(b.label);
});

const builtinServersList = [];
const pluginServersList = [];
const customServersList = [];

for (const server of sortedServers) {
const source = server.launcher?.install?.source
? ` • ${server.launcher.install.source}`
: "";
const languagesList =
Array.isArray(server.languages) && server.languages.length
? `${server.languages.join(", ")}${source}`
: source.slice(3);

const serverItem = {
key: `server:${server.id}`,
text: server.label,
info: languagesList || undefined,
chevron: true,
};

if (builtinServers.some((s) => s.id === server.id)) {
serverItem.category = categories.builtinServers;
builtinServersList.push(serverItem);
} else if (isCustomServer(server.id)) {
serverItem.category = categories.customServers;
customServersList.push(serverItem);
} else {
serverItem.category = categories.pluginServers;
pluginServersList.push(serverItem);
}
}

const items = [
{
key: "allow_non_terminal_workspace",
Expand All @@ -217,34 +254,18 @@ export default function lspSettings() {
info: strings["settings-info-lsp-allow-non-terminal-workspace"],
category: categories.behavior,
},
...builtinServersList,
...pluginServersList,
{
key: "add_custom_server",
text: strings["lsp-add-custom-server"],
info: strings["settings-info-lsp-add-custom-server"],
category: categories.customServers,
index: 0,
chevron: true,
},
...customServersList,
];

for (const server of sortedServers) {
const source = server.launcher?.install?.source
? ` • ${server.launcher.install.source}`
: "";
const languagesList =
Array.isArray(server.languages) && server.languages.length
? `${server.languages.join(", ")}${source}`
: source.slice(3);

items.push({
key: `server:${server.id}`,
text: server.label,
info: languagesList || undefined,
category: categories.servers,
chevron: true,
});
}

items.push({
note: strings["settings-note-lsp-settings"],
});
Expand Down