Skip to content

Commit

Permalink
refer to ZLS as "ZLS language server" instead of "Zig Language Server"
Browse files Browse the repository at this point in the history
  • Loading branch information
Techatrix committed Dec 13, 2024
1 parent b592189 commit 7a3d098
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- automatic formatting
- Run/Debug zig program
- Run/Debug tests
- optional [Zig Language Server](https://github.com/zigtools/zls) features
- optional [ZLS language server](https://github.com/zigtools/zls) features
- completions
- goto definition/declaration
- document symbols
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"enumItemLabels": [
"Off",
"Extension",
"Zig Language Server"
"ZLS language server"
],
"enumDescriptions": [
"Disable formatting",
Expand Down Expand Up @@ -150,7 +150,7 @@
"zig.zls.enabled": {
"scope": "resource",
"type": "string",
"description": "Whether to enable the optional ZLS Language Server",
"description": "Whether to enable the optional ZLS language server",
"enum": [
"ask",
"off",
Expand Down Expand Up @@ -334,17 +334,17 @@
{
"command": "zig.zls.enable",
"title": "Enable Language Server",
"category": "Zig Language Server"
"category": "ZLS language server"
},
{
"command": "zig.zls.startRestart",
"title": "Start / Restart Language Server",
"category": "Zig Language Server"
"category": "ZLS language server"
},
{
"command": "zig.zls.stop",
"title": "Stop Language Server",
"category": "Zig Language Server"
"category": "ZLS language server"
}
],
"jsonValidation": [
Expand Down
10 changes: 5 additions & 5 deletions src/zls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ export async function restartClient(context: vscode.ExtensionContext): Promise<v
updateStatusItem(result.version);
} catch (reason) {
if (reason instanceof Error) {
void vscode.window.showWarningMessage(`Failed to run Zig Language Server (ZLS): ${reason.message}`);
void vscode.window.showWarningMessage(`Failed to run ZLS language server: ${reason.message}`);
} else {
void vscode.window.showWarningMessage("Failed to run Zig Language Server (ZLS)");
void vscode.window.showWarningMessage("Failed to run ZLS language server");
}
updateStatusItem(null);
}
Expand Down Expand Up @@ -85,7 +85,7 @@ async function startClient(zlsPath: string, zlsVersion: semver.SemVer): Promise<
},
};

const languageClient = new LanguageClient("zig.zls", "Zig Language Server", serverOptions, clientOptions);
const languageClient = new LanguageClient("zig.zls", "ZLS language server", serverOptions, clientOptions);
await languageClient.start();
// Formatting is handled by `zigFormat.ts`
languageClient.getFeature("textDocument/formatting").dispose();
Expand Down Expand Up @@ -329,7 +329,7 @@ async function isEnabled(): Promise<boolean> {
return false;
case "ask": {
const response = await vscode.window.showInformationMessage(
"We recommend enabling the ZLS Language Server for a better editing experience. Would you like to install it?",
"We recommend enabling the ZLS language server for a better editing experience. Would you like to install it?",
{ modal: true },
"Yes",
"No",
Expand Down Expand Up @@ -410,7 +410,7 @@ export async function activate(context: vscode.ExtensionContext) {
},
};

outputChannel = vscode.window.createOutputChannel("Zig Language Server");
outputChannel = vscode.window.createOutputChannel("ZLS language server");
statusItem = vscode.languages.createLanguageStatusItem("zig.zls.status", ZIG_MODE);
statusItem.name = "ZLS";
updateStatusItem(null);
Expand Down

0 comments on commit 7a3d098

Please sign in to comment.