Skip to content

refactor(editor): LanguageClient can be undefined #10112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Mar 29, 2025
Merged

refactor(editor): LanguageClient can be undefined #10112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions editors/vscode/client/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const enum LspCommands {
FixAll = 'oxc.fixAll',
}

let client: LanguageClient;
let client: LanguageClient | undefined;

let myStatusBarItem: StatusBarItem;

Expand All @@ -50,7 +50,7 @@ export async function activate(context: ExtensionContext) {
const restartCommand = commands.registerCommand(
OxcCommands.RestartServer,
async () => {
if (!client) {
if (client === undefined) {
window.showErrorMessage('oxc client not found');
return;
}
Expand All @@ -65,7 +65,7 @@ export async function activate(context: ExtensionContext) {

window.showInformationMessage('oxc server restarted.');
} else {
await startClient();
await startClient(client);
}
} catch (err) {
client.error('Restarting client failed', err, 'force');
Expand All @@ -85,13 +85,17 @@ export async function activate(context: ExtensionContext) {
async () => {
await configService.config.updateEnable(!configService.config.enable);

if (client === undefined) {
return;
}

if (client.isRunning()) {
if (!configService.config.enable) {
await client.stop();
}
} else {
if (configService.config.enable) {
await startClient();
await startClient(client);
}
}
},
Expand Down Expand Up @@ -239,15 +243,19 @@ export async function activate(context: ExtensionContext) {
});

workspace.onDidDeleteFiles((event) => {
event.files.forEach((fileUri) => {
client.diagnostics?.delete(fileUri);
});
for (const fileUri of event.files) {
client?.diagnostics?.delete(fileUri);
}
});

configService.onConfigChange = async function onConfigChange(event) {
let settings = this.config.toLanguageServerConfig();
updateStatsBar(this.config.enable);

if (client === undefined) {
return;
}

if (client.isRunning()) {
client.sendNotification('workspace/didChangeConfiguration', { settings });
}
Expand Down Expand Up @@ -286,12 +294,15 @@ export async function activate(context: ExtensionContext) {
updateStatsBar(configService.config.enable);

if (configService.config.enable) {
await startClient();
await startClient(client);
}
}

// Starts the client, it does not check if it is already started
async function startClient() {
async function startClient(client: LanguageClient | undefined) {
if (client === undefined) {
return;
}
await client.start();
// ToDo: refactor it on the server side.
// Do not touch watchers on client side, just simplify the start of the server.
Expand Down