Skip to content
Merged
Changes from 1 commit
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
24 changes: 20 additions & 4 deletions src/sourcekit-lsp/LanguageClientManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,11 @@ export class LanguageClientManager implements vscode.Disposable {
const uri = folder.folder;
if (this.languageClient === undefined) {
this.currentWorkspaceFolder = folder;
this.restartedPromise = this.setupLanguageClient(folder);
this.restartedPromise = this.setupLanguageClient(folder).catch(reason => {
this.folderContext.workspaceContext.logger.error(
`Error starting SourceKit-LSP in setLanguageClientFolder: ${reason}`
);
});
return;
} else {
// don't check for undefined uri's or if the current workspace is the same if we are
Expand Down Expand Up @@ -368,9 +372,18 @@ export class LanguageClientManager implements vscode.Disposable {
client.outputChannel.dispose();
})
.catch(async reason => {
this.folderContext.workspaceContext.logger.error(
`Error starting SourceKit-LSP in restartLanguageClient: ${reason}`
);
// error message matches code here https://github.com/microsoft/vscode-languageserver-node/blob/2041784436fed53f4e77267a49396bca22a7aacf/client/src/common/client.ts#L1409C1-L1409C54
if (reason.message === "Stopping the server timed out") {
await this.setupLanguageClient(workspaceFolder);
try {
await this.setupLanguageClient(workspaceFolder);
} catch (reason) {
this.folderContext.workspaceContext.logger.error(
`Error starting SourceKit-LSP after server timeout in restartLanguageClient: ${reason}`
);
}
}
this.folderContext.workspaceContext.logger.error(reason);
});
Expand Down Expand Up @@ -488,7 +501,10 @@ export class LanguageClientManager implements vscode.Disposable {
};
}

private async startClient(client: LanguageClient, errorHandler: SourceKitLSPErrorHandler) {
private startClient(
client: LanguageClient,
errorHandler: SourceKitLSPErrorHandler
): Promise<void> {
const runningPromise = new Promise<void>((res, rej) => {
const disposable = client.onDidChangeState(e => {
// if state is now running add in any sub-folder workspaces that
Expand Down Expand Up @@ -550,7 +566,7 @@ export class LanguageClientManager implements vscode.Disposable {
}
} catch (reason) {
this.folderContext.workspaceContext.logger.error(
`Error starting SourceKit-LSP: ${reason}`
`Error starting SourceKit-LSP in startClient: ${reason}`
);
if (this.languageClient?.state === State.Running) {
await this.languageClient?.stop();
Expand Down