Skip to content

Languageclient v8 #314

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
merged 3 commits into from
May 27, 2022
Merged

Languageclient v8 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59f4a68
Use vscode-languageclient v8.0.0
adam-fowler May 24, 2022
24cb8c1
Fixup LanguageClientManager for v8 client
adam-fowler May 24, 2022
08dc951
Delete DocumentSymbols.ts
adam-fowler May 24, 2022
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
70 changes: 35 additions & 35 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,6 @@
"dependencies": {
"@types/plist": "^3.0.2",
"plist": "^3.0.5",
"vscode-languageclient": "^7.0.0"
"vscode-languageclient": "^8.0.0"
}
}
43 changes: 0 additions & 43 deletions src/sourcekit-lsp/DocumentSymbols.ts
View file
Open in desktop

This file was deleted.

71 changes: 28 additions & 43 deletions src/sourcekit-lsp/LanguageClientManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ export class LanguageClientManager {
private onChangeConfig: vscode.Disposable;
private inlayHints?: vscode.Disposable;
private supportsDidChangedWatchedFiles: boolean;
private startedPromise?: Promise<void>;
private restartedPromise?: Promise<void>;
private currentWorkspaceFolder?: vscode.Uri;
private waitingOnRestartCount: number;
private clientReadyPromise?: Promise<void>;
public documentSymbolWatcher?: (
document: vscode.TextDocument,
symbols: vscode.DocumentSymbol[] | null | undefined
Expand Down Expand Up @@ -154,7 +155,7 @@ export class LanguageClientManager {
async setLanguageClientFolder(uri?: vscode.Uri, forceRestart = false) {
if (this.languageClient === undefined) {
this.currentWorkspaceFolder = uri;
this.startedPromise = this.setupLanguageClient(uri);
this.restartedPromise = this.setupLanguageClient(uri);
return;
} else {
if (uri === undefined || (this.currentWorkspaceFolder === uri && !forceRestart)) {
Expand All @@ -164,9 +165,9 @@ export class LanguageClientManager {
this.waitingOnRestartCount += 1;
// if in the middle of a restart then we have to wait until that
// restart has finished
if (this.startedPromise) {
if (this.restartedPromise) {
try {
await this.startedPromise;
await this.restartedPromise;
} catch (error) {
//ignore error
}
Expand All @@ -186,24 +187,10 @@ export class LanguageClientManager {
if (client) {
this.cancellationToken?.cancel();
this.cancellationToken?.dispose();
this.startedPromise = client
this.restartedPromise = client
.stop()
.then(async () => {
// if force restart is set then rebuild client completely
// before starting otherwise just set the workspace folder
// and call `startClient`
if (forceRestart) {
await this.setupLanguageClient(uri);
} else {
// change workspace folder and restart
const workspaceFolder = {
uri: uri,
name: FolderContext.uriName(uri),
index: 0,
};
client.clientOptions.workspaceFolder = workspaceFolder;
await this.startClient(client);
}
await this.setupLanguageClient(uri);
})
.catch(reason => {
this.workspaceContext.outputChannel.log(`${reason}`);
Expand All @@ -230,7 +217,7 @@ export class LanguageClientManager {
if (!this.languageClient) {
throw LanguageClientError.LanguageClientUnavailable;
}
return await this.languageClient.onReady().then(() => {
return await this.clientReadyPromise?.then(() => {
if (!this.languageClient || !this.cancellationToken) {
throw LanguageClientError.LanguageClientUnavailable;
}
Expand All @@ -255,12 +242,12 @@ export class LanguageClientManager {
return false;
}

private async setupLanguageClient(folder?: vscode.Uri): Promise<void> {
const client = await this.createLSPClient(folder);
await this.startClient(client);
private setupLanguageClient(folder?: vscode.Uri): Promise<void> {
const client = this.createLSPClient(folder);
return this.startClient(client);
}

private async createLSPClient(folder?: vscode.Uri): Promise<langclient.LanguageClient> {
private createLSPClient(folder?: vscode.Uri): langclient.LanguageClient {
const lspConfig = configuration.lsp;
const serverPathConfig = lspConfig.serverPath;
const serverPath =
Expand Down Expand Up @@ -332,9 +319,7 @@ export class LanguageClientManager {
);
}

private async startClient(client: langclient.LanguageClient) {
client.start();

private startClient(client: langclient.LanguageClient): Promise<void> {
if (client.clientOptions.workspaceFolder) {
this.workspaceContext.outputChannel.log(
`SourceKit-LSP setup for ${FolderContext.uriName(
Expand All @@ -345,24 +330,24 @@ export class LanguageClientManager {
this.workspaceContext.outputChannel.log(`SourceKit-LSP setup`);
}

// start client
this.clientReadyPromise = client
.start()
.then(() => {
this.inlayHints = activateInlayHints(client);
})
.catch(reason => {
this.workspaceContext.outputChannel.log(`${reason}`);
// if language client failed to initialise then shutdown and set to undefined
this.languageClient?.stop();
this.languageClient = undefined;
throw reason;
});

this.languageClient = client;
this.cancellationToken = new vscode.CancellationTokenSource();

return new Promise<void>((resolve, reject) => {
client
.onReady()
.then(() => {
this.inlayHints = activateInlayHints(client);
resolve();
})
.catch(reason => {
this.workspaceContext.outputChannel.log(`${reason}`);
// if language client failed to initialise then shutdown and set to undefined
this.languageClient?.stop();
this.languageClient = undefined;
reject(reason);
});
});
return this.clientReadyPromise;
}
}

Expand Down