From f749b6eb1935d9a20068b9c774342aaa55c457cc Mon Sep 17 00:00:00 2001 From: Bob Brown Date: Thu, 24 May 2018 14:17:51 -0700 Subject: [PATCH 1/2] reduce promise reject messages in the standard case --- Extension/src/LanguageServer/extension.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 8f1f36790..a895a6c24 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -89,6 +89,9 @@ export function registerCustomConfigurationProvider(provider: CustomConfiguratio export async function provideCustomConfiguration(document: vscode.TextDocument, client: Client): Promise { 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++) { @@ -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); } }); From 84fc0587174b02352ce54369f34935bf42278ffd Mon Sep 17 00:00:00 2001 From: Bob Brown Date: Thu, 24 May 2018 14:24:54 -0700 Subject: [PATCH 2/2] wrong condition --- Extension/src/LanguageServer/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index a895a6c24..d034209dd 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -89,7 +89,7 @@ export function registerCustomConfigurationProvider(provider: CustomConfiguratio export async function provideCustomConfiguration(document: vscode.TextDocument, client: Client): Promise { let tokenSource: CancellationTokenSource = new CancellationTokenSource(); - if (customConfigurationProviders.length > 0) { + if (customConfigurationProviders.length === 0) { return Promise.resolve(); } return client.runBlockingThenableWithTimeout(async () => {