Skip to content

Commit 5adfd0b

Browse files
KalmaegiKalmaegi
authored
1 parent 46e83a2 commit 5adfd0b

File tree

1 file changed

+30
-29
lines changed

1 file changed

+30
-29
lines changed

‎src/vs/workbench/contrib/preferences/browser/settingsTree.ts

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,68 +5,69 @@
55

66
import { BrowserFeatures } from 'vs/base/browser/canIUse';
77
import * as DOM from 'vs/base/browser/dom';
8+
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
9+
import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
810
import { IMouseEvent } from 'vs/base/browser/mouseEvent';
911
import * as aria from 'vs/base/browser/ui/aria/aria';
1012
import { Button } from 'vs/base/browser/ui/button/button';
11-
import { Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
13+
import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
1214
import { IInputOptions, InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
1315
import { CachedListVirtualDelegate } from 'vs/base/browser/ui/list/list';
1416
import { DefaultStyleController, IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
1517
import { ISelectOptionItem, SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
18+
import { Toggle, unthemedToggleStyles } from 'vs/base/browser/ui/toggle/toggle';
1619
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
20+
import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
21+
import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
1722
import { IObjectTreeOptions } from 'vs/base/browser/ui/tree/objectTree';
1823
import { ObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
1924
import { ITreeFilter, ITreeModel, ITreeNode, ITreeRenderer, TreeFilterResult, TreeVisibility } from 'vs/base/browser/ui/tree/tree';
2025
import { Action, IAction, Separator } from 'vs/base/common/actions';
26+
import { Codicon } from 'vs/base/common/codicons';
2127
import { onUnexpectedError } from 'vs/base/common/errors';
2228
import { Emitter, Event } from 'vs/base/common/event';
29+
import { IJSONSchema } from 'vs/base/common/jsonSchema';
2330
import { KeyCode } from 'vs/base/common/keyCodes';
2431
import { Disposable, DisposableStore, dispose, isDisposable, toDisposable } from 'vs/base/common/lifecycle';
2532
import { isIOS } from 'vs/base/common/platform';
2633
import { escapeRegExpCharacters } from 'vs/base/common/strings';
2734
import { isDefined, isUndefinedOrNull } from 'vs/base/common/types';
35+
import { ILanguageService } from 'vs/editor/common/languages/language';
36+
import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
2837
import { localize } from 'vs/nls';
2938
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
3039
import { ICommandService } from 'vs/platform/commands/common/commands';
31-
import { ConfigurationTarget, getLanguageTagSettingPlainKey, IConfigurationService } from 'vs/platform/configuration/common/configuration';
40+
import { ConfigurationTarget, IConfigurationService, getLanguageTagSettingPlainKey } from 'vs/platform/configuration/common/configuration';
41+
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
42+
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
3243
import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
3344
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
3445
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
46+
import { IListService, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
47+
import { ILogService } from 'vs/platform/log/common/log';
3548
import { IOpenerService } from 'vs/platform/opener/common/opener';
49+
import { IProductService } from 'vs/platform/product/common/productService';
50+
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
51+
import { defaultButtonStyles, getInputBoxStyle, getListStyles, getSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
3652
import { editorBackground, foreground } from 'vs/platform/theme/common/colorRegistry';
3753
import { IThemeService } from 'vs/platform/theme/common/themeService';
54+
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
3855
import { getIgnoredSettings } from 'vs/platform/userDataSync/common/settingsMerge';
56+
import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync';
57+
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
58+
import { settingsMoreActionIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
59+
import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
60+
import { ISettingOverrideClickEvent, SettingsTreeIndicatorsLabel, getIndicatorsLabelAriaLabel } from 'vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators';
3961
import { ITOCEntry } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
40-
import { inspectSetting, ISettingsEditorViewState, settingKeyToDisplayFormat, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
41-
import { ExcludeSettingWidget, ISettingListChangeEvent, IListDataItem, ListSettingWidget, ObjectSettingDropdownWidget, IObjectDataItem, IObjectEnumOption, ObjectValue, IObjectValueSuggester, IObjectKeySuggester, ObjectSettingCheckboxWidget, IncludeSettingWidget } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';
62+
import { ISettingsEditorViewState, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, settingKeyToDisplayFormat } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels';
63+
import { ExcludeSettingWidget, IListDataItem, IObjectDataItem, IObjectEnumOption, IObjectKeySuggester, IObjectValueSuggester, ISettingListChangeEvent, IncludeSettingWidget, ListSettingWidget, ObjectSettingCheckboxWidget, ObjectSettingDropdownWidget, ObjectValue } from 'vs/workbench/contrib/preferences/browser/settingsWidgets';
4264
import { LANGUAGE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences';
65+
import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
66+
import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
4367
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
68+
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
4469
import { ISetting, ISettingsGroup, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
45-
import { getDefaultIgnoredSettings, IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
4670
import { getInvalidTypeError } from 'vs/workbench/services/preferences/common/preferencesValidation';
47-
import { Codicon } from 'vs/base/common/codicons';
48-
import { SimpleIconLabel } from 'vs/base/browser/ui/iconLabel/simpleIconLabel';
49-
import { IJSONSchema } from 'vs/base/common/jsonSchema';
50-
import { IList } from 'vs/base/browser/ui/tree/indexTreeModel';
51-
import { IListService, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
52-
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
53-
import { ILogService } from 'vs/platform/log/common/log';
54-
import { settingsMoreActionIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
55-
import { IWorkbenchConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
56-
import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
57-
import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
58-
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
59-
import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
60-
import { getIndicatorsLabelAriaLabel, ISettingOverrideClickEvent, SettingsTreeIndicatorsLabel } from 'vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators';
61-
import { ILanguageService } from 'vs/editor/common/languages/language';
62-
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
63-
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
64-
import { defaultButtonStyles, getInputBoxStyle, getListStyles, getSelectBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
65-
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
66-
import { RenderIndentGuides } from 'vs/base/browser/ui/tree/abstractTree';
67-
import { IProductService } from 'vs/platform/product/common/productService';
68-
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
69-
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
7071

7172
const $ = DOM.$;
7273

@@ -2312,7 +2313,7 @@ class SettingsTreeAccessibilityProvider implements IListAccessibilityProvider<Se
23122313
ariaLabelSections.push(`${indicatorsLabelAriaLabel}.`);
23132314
}
23142315

2315-
const descriptionWithoutSettingLinks = fixSettingLinks(element.description, false);
2316+
const descriptionWithoutSettingLinks = renderMarkdownAsPlaintext({ value: fixSettingLinks(element.description, false) });
23162317
if (descriptionWithoutSettingLinks.length) {
23172318
ariaLabelSections.push(descriptionWithoutSettingLinks);
23182319
}

0 commit comments

Comments
 (0)