Skip to content
Merged
Changes from all commits
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
5 changes: 4 additions & 1 deletion Extension/src/LanguageServer/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ export function registerCustomConfigurationProvider(provider: CustomConfiguratio

export async function provideCustomConfiguration(document: vscode.TextDocument, client: Client): Promise<void> {
let tokenSource: CancellationTokenSource = new CancellationTokenSource();
if (customConfigurationProviders.length === 0) {
return Promise.resolve();
}
return client.runBlockingThenableWithTimeout(async () => {
// Loop through registered providers until one is able to service the current document
for (let i: number = 0; i < customConfigurationProviders.length; i++) {
Expand All @@ -98,7 +101,7 @@ export async function provideCustomConfiguration(document: vscode.TextDocument,
}
return Promise.reject("No providers found for " + document.uri);
}, 1000, tokenSource).then((configs: SourceFileConfigurationItem[]) => {
if (configs !== null && configs.length > 0) {
if (configs && configs.length > 0) {
client.sendCustomConfigurations(configs);
}
});
Expand Down