development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ignoredSettings cache for aria label (#170911)

Browse source 
Ref #153580
This commit is contained in:
Raymond Zhao 2023-01-10 17:20:36 -08:00 committed by GitHub
parent 6674e482a2
commit bb80f439c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
View file

@ -17,8 +17,7 @@ import { localize } from 'vs/nls';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
import { getIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
import { getDefaultIgnoredSettings, IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
import { SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
import { POLICY_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
import { IHoverOptions, IHoverService, IHoverWidget } from 'vs/workbench/services/hover/browser/hover';
@ -39,6 +38,19 @@ interface SettingIndicator {
disposables: DisposableStore;
}
/**
* Contains a set of the sync-ignored settings
* to keep the sync ignored indicator and the getIndicatorsLabelAriaLabel() function in sync.
* SettingsTreeIndicatorsLabel#updateSyncIgnored provides the source of truth.
*/
let cachedSyncIgnoredSettingsSet: Set<string> = new Set<string>();
/**
* Contains a copy of the sync-ignored settings to determine when to update
* cachedSyncIgnoredSettingsSet.
*/
let cachedSyncIgnoredSettings: string[] = [];
/**
* Renders the indicators next to a setting, such as "Also Modified In".
*/
@ -214,6 +226,10 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
this.syncIgnoredIndicator.element.style.display = this.userDataSyncEnablementService.isEnabled()
&& ignoredSettings.includes(element.setting.key) ? 'inline' : 'none';
this.render();
if (cachedSyncIgnoredSettings !== ignoredSettings) {
cachedSyncIgnoredSettings = ignoredSettings;
cachedSyncIgnoredSettingsSet = new Set<string>(cachedSyncIgnoredSettings);
}
}
private getInlineScopeDisplayText(completeScope: string): string {
@ -455,8 +471,7 @@ export function getIndicatorsLabelAriaLabel(element: SettingsTreeSettingElement,
}
// Add sync ignored text
const ignoredSettings = getIgnoredSettings(getDefaultIgnoredSettings(), configurationService);
if (ignoredSettings.includes(element.setting.key)) {
if (cachedSyncIgnoredSettingsSet.has(element.setting.key)) {
ariaLabelSections.push(localize('syncIgnoredAriaLabel', "Setting ignored during sync"));
}