Skip to content

Commit 65fcb15

Browse files
change intellisense engine to lowercase not bool
1 parent 304a336 commit 65fcb15

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Extension/src/LanguageServer/customProviders.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class CustomConfigurationProviderCollection {
158158
}
159159

160160
public add(provider: CustomConfigurationProvider, version: Version): boolean {
161-
if (new CppSettings(ext.getActiveClient().RootUri).intelliSenseEngine === "Disabled") {
161+
if (new CppSettings(ext.getActiveClient().RootUri).intelliSenseEngine === "disabled") {
162162
console.warn("Language service is disabled. Provider will not be registered.");
163163
return false;
164164
}

Extension/src/LanguageServer/settings.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export class CppSettings extends Settings {
204204
public get clangFormatSortIncludes(): string | undefined { return super.Section.get<string>("clang_format_sortIncludes"); }
205205
public get experimentalFeatures(): boolean | undefined { return super.Section.get<string>("experimentalFeatures")?.toLowerCase() === "enabled"; }
206206
public get suggestSnippets(): boolean | undefined { return super.Section.get<boolean>("suggestSnippets"); }
207-
public get intelliSenseEngine(): string | undefined { return super.Section.get<string>("intelliSenseEngine"); }
207+
public get intelliSenseEngine(): string | undefined { return super.Section.get<string>("intelliSenseEngine")?.toLowerCase(); }
208208
public get intelliSenseEngineFallback(): boolean | undefined { return super.Section.get<string>("intelliSenseEngineFallback")?.toLowerCase() === "enabled"; }
209209
public get intelliSenseCachePath(): string | undefined { return super.Section.get<string>("intelliSenseCachePath"); }
210210
public get intelliSenseCacheSize(): number | undefined { return super.Section.get<number>("intelliSenseCacheSize"); }
@@ -288,7 +288,7 @@ export class CppSettings extends Settings {
288288

289289
public get enhancedColorization(): boolean {
290290
return super.Section.get<string>("enhancedColorization")?.toLowerCase() === "enabled"
291-
&& super.Section.get<string>("intelliSenseEngine") === "Default"
291+
&& super.Section.get<string>("intelliSenseEngine")?.toLowerCase() === "default"
292292
&& vscode.workspace.getConfiguration("workbench").get<string>("colorTheme") !== "Default High Contrast";
293293
}
294294

@@ -560,7 +560,7 @@ export class CppSettings extends Settings {
560560

561561
public get dimInactiveRegions(): boolean {
562562
return super.Section.get<boolean>("dimInactiveRegions") === true
563-
&& super.Section.get<string>("intelliSenseEngine") === "Default"
563+
&& super.Section.get<string>("intelliSenseEngine")?.toLowerCase() === "default"
564564
&& vscode.workspace.getConfiguration("workbench").get<string>("colorTheme") !== "Default High Contrast";
565565
}
566566

Extension/src/main.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<CppToo
8181
// Read the setting and determine whether we should activate the language server prior to installing callbacks,
8282
// to ensure there is no potential race condition. LanguageServer.activate() is called near the end of this
8383
// function, to allow any further setup to occur here, prior to activation.
84-
const isIntelliSenseEngineDisabled: boolean = settings.intelliSenseEngine === "Disabled";
84+
const isIntelliSenseEngineDisabled: boolean = settings.intelliSenseEngine === "disabled";
8585
const shouldActivateLanguageServer: boolean = (!isIntelliSenseEngineDisabled && !isOldMacOs);
8686

8787
if (isOldMacOs) {
8888
languageServiceDisabled = true;
8989
vscode.window.showErrorMessage(localize("macos.version.deprecated", "Versions of the C/C++ extension more recent than {0} require at least macOS version {1}.", "1.9.8", "10.12"));
9090
} else {
91-
if (settings.intelliSenseEngine === "Disabled") {
91+
if (settings.intelliSenseEngine === "disabled") {
9292
languageServiceDisabled = true;
9393
}
9494
let currentIntelliSenseEngineValue: string | undefined = settings.intelliSenseEngine;
9595
disposables.push(vscode.workspace.onDidChangeConfiguration(() => {
9696
const settings: CppSettings = new CppSettings((vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) ? vscode.workspace.workspaceFolders[0]?.uri : undefined);
9797
if (!reloadMessageShown && settings.intelliSenseEngine !== currentIntelliSenseEngineValue) {
98-
if (currentIntelliSenseEngineValue === "Disabled") {
98+
if (currentIntelliSenseEngineValue === "disabled") {
9999
// If switching from disabled to enabled, we can continue activation.
100100
currentIntelliSenseEngineValue = settings.intelliSenseEngine;
101101
languageServiceDisabled = false;
@@ -141,7 +141,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CppToo
141141
LanguageServer.registerCommands(false);
142142
// The check here for isIntelliSenseEngineDisabled avoids logging
143143
// the message on old Macs that we've already displayed a warning for.
144-
log(localize("intellisense.disabled", "intelliSenseEngine is Disabled"));
144+
log(localize("intellisense.disabled", "intelliSenseEngine is disabled"));
145145
}
146146

147147
return cppTools;

0 commit comments

Comments
 (0)