From 8d42c49b77aadb5ae4286f21efcd159601118805 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Thu, 21 Dec 2023 12:27:41 -0800 Subject: [PATCH] Fix configuration provider handling with intelliSenseEngine "disabled". (#11797) --- Extension/src/LanguageServer/customProviders.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extension/src/LanguageServer/customProviders.ts b/Extension/src/LanguageServer/customProviders.ts index 5e9a7439ad..f0252e5a0d 100644 --- a/Extension/src/LanguageServer/customProviders.ts +++ b/Extension/src/LanguageServer/customProviders.ts @@ -6,7 +6,6 @@ import * as vscode from 'vscode'; import { CustomConfigurationProvider, SourceFileConfigurationItem, Version, WorkspaceBrowseConfiguration } from 'vscode-cpptools'; -import * as ext from './extension'; import { CppSettings } from './settings'; /** @@ -158,7 +157,8 @@ export class CustomConfigurationProviderCollection { } public add(provider: CustomConfigurationProvider, version: Version): boolean { - if (new CppSettings(ext.getActiveClient().RootUri).intelliSenseEngine === "disabled") { + const settings: CppSettings = new CppSettings((vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) ? vscode.workspace.workspaceFolders[0]?.uri : undefined); + if (settings.intelliSenseEngine === "disabled") { console.warn("Language service is disabled. Provider will not be registered."); return false; }