Skip to content

Commit 33a205b

Browse files
authored
Fix issue with config requests before provider has registered (#13167)
1 parent ce0435b commit 33a205b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Diff for: Extension/src/LanguageServer/client.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,7 @@ interface CodeAnalysisParams {
479479

480480
interface FinishedRequestCustomConfigParams {
481481
uri: string;
482+
isProviderRegistered: boolean;
482483
}
483484

484485
export interface TextDocumentWillSaveParams {
@@ -2102,8 +2103,9 @@ export class DefaultClient implements Client {
21022103
}
21032104

21042105
public async provideCustomConfiguration(docUri: vscode.Uri): Promise<void> {
2106+
let isProviderRegistered: boolean = false;
21052107
const onFinished: () => void = () => {
2106-
void this.languageClient.sendNotification(FinishedRequestCustomConfig, { uri: docUri.toString() });
2108+
void this.languageClient.sendNotification(FinishedRequestCustomConfig, { uri: docUri.toString(), isProviderRegistered });
21072109
};
21082110
try {
21092111
const providerId: string | undefined = this.configurationProvider;
@@ -2114,6 +2116,7 @@ export class DefaultClient implements Client {
21142116
if (!provider || !provider.isReady) {
21152117
return;
21162118
}
2119+
isProviderRegistered = true;
21172120
const resultCode = await this.provideCustomConfigurationAsync(docUri, provider);
21182121
telemetry.logLanguageServerEvent('provideCustomConfiguration', { providerId, resultCode });
21192122
} finally {

0 commit comments

Comments
 (0)