Skip to content

Enable/Disable Hex mode button: modify setting in existing location #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haneefdm merged 2 commits into from
Apr 8, 2025
Merged

Enable/Disable Hex mode button: modify setting in existing location #1109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7aa2b9
Enable/Disable Hex mode button: modify setting in existing location
malsyned Mar 31, 2025
bad9717
getConfigSource: fix inheritance order for language overrides
malsyned Mar 31, 2025
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
30 changes: 28 additions & 2 deletions src/frontend/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,30 @@ export class CortexDebugExtension {
);
}

private getConfigSource(config: vscode.WorkspaceConfiguration, section: string): [vscode.ConfigurationTarget, boolean] {
const configurationTargetMapping: [string, vscode.ConfigurationTarget][] = [
['workspaceFolder', vscode.ConfigurationTarget.WorkspaceFolder],
['workspace', vscode.ConfigurationTarget.Workspace],
['global', vscode.ConfigurationTarget.Global],
// Modify user settings if setting isn't configured yet
['default', vscode.ConfigurationTarget.Global],
];
const info = config.inspect(section);
for (const inspectKeySuffix of ['LanguageValue', 'Value']) {
for (const mapping of configurationTargetMapping) {
const [inspectKeyPrefix, mappingTarget] = mapping;
const inspectKey = inspectKeyPrefix + inspectKeySuffix;
if (info[inspectKey] !== undefined)
return [mappingTarget, inspectKeySuffix == 'LanguageValue'];
}
}
// Shouldn't get here unless new configuration targets get added to the
// VSCode API, only those sources have values for this setting, and this
// setting doesn't have a default value. Still, do something rational
// just in case.
return [vscode.ConfigurationTarget.Global, false];
}

// Settings changes
private variablesNaturalMode(newVal: boolean, cxt?: any) {
// 'cxt' contains the treeItem on which this menu was invoked. Maybe we can do something
Expand All @@ -339,7 +363,8 @@ export class CortexDebugExtension {

vscode.commands.executeCommand('setContext', `cortex-debug:${CortexDebugKeys.VARIABLE_DISPLAY_MODE}`, newVal);
try {
config.update(CortexDebugKeys.VARIABLE_DISPLAY_MODE, newVal);
const [target, languageOverride] = this.getConfigSource(config, CortexDebugKeys.VARIABLE_DISPLAY_MODE);
config.update(CortexDebugKeys.VARIABLE_DISPLAY_MODE, newVal, target, languageOverride);
} catch (e) {
console.error(e);
}
Expand All @@ -353,7 +378,8 @@ export class CortexDebugExtension {
const newVal = !curVal;
vscode.commands.executeCommand('setContext', `cortex-debug:${CortexDebugKeys.VARIABLE_DISPLAY_MODE}`, newVal);
try {
config.update(CortexDebugKeys.VARIABLE_DISPLAY_MODE, newVal);
const [target, languageOverride] = this.getConfigSource(config, CortexDebugKeys.VARIABLE_DISPLAY_MODE);
config.update(CortexDebugKeys.VARIABLE_DISPLAY_MODE, newVal, target, languageOverride);
} catch (e) {
console.error(e);
}
Expand Down