Fix configuration provider handling with intelliSenseEngine "disabled…

…". (#11797)
microsoft · Dec 21, 2023 · 8d42c49 · 8d42c49
1 parent 0e24296
commit 8d42c49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
         }