Skip to content

Commit 999b779

Browse files
authored
fix: register actions in SettingsTargetsWidget (microsoft#249676)
1 parent dbfbc10 commit 999b779

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import * as DOM from '../../../../base/browser/dom.js';
77
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
88
import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
99
import { BaseActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
10+
import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
11+
import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
1012
import { HistoryInputBox, IHistoryInputOptions } from '../../../../base/browser/ui/inputbox/inputBox.js';
1113
import { Widget } from '../../../../base/browser/ui/widget.js';
1214
import { Action, IAction } from '../../../../base/common/actions.js';
@@ -16,28 +18,26 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
1618
import { Disposable } from '../../../../base/common/lifecycle.js';
1719
import { Schemas } from '../../../../base/common/network.js';
1820
import { isEqual } from '../../../../base/common/resources.js';
21+
import { ThemeIcon } from '../../../../base/common/themables.js';
1922
import { URI } from '../../../../base/common/uri.js';
2023
import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
24+
import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
25+
import { ILanguageService } from '../../../../editor/common/languages/language.js';
2126
import { IModelDeltaDecoration, TrackedRangeStickiness } from '../../../../editor/common/model.js';
2227
import { localize } from '../../../../nls.js';
23-
import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
24-
import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
2528
import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
2629
import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
2730
import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
31+
import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
32+
import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
33+
import { IHoverService } from '../../../../platform/hover/browser/hover.js';
2834
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
2935
import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
3036
import { ILabelService } from '../../../../platform/label/common/label.js';
3137
import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
32-
import { ThemeIcon } from '../../../../base/common/themables.js';
3338
import { isWorkspaceFolder, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
34-
import { settingsEditIcon, settingsScopeDropDownIcon } from './preferencesIcons.js';
3539
import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
36-
import { ILanguageService } from '../../../../editor/common/languages/language.js';
37-
import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
38-
import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
39-
import { IHoverService } from '../../../../platform/hover/browser/hover.js';
40-
import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
40+
import { settingsEditIcon, settingsScopeDropDownIcon } from './preferencesIcons.js';
4141

4242
export class FolderSettingsActionViewItem extends BaseActionViewItem {
4343

@@ -266,20 +266,20 @@ export class SettingsTargetsWidget extends Widget {
266266
actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => action.id === 'folderSettings' ? this.folderSettings : undefined
267267
}));
268268

269-
this.userLocalSettings = new Action('userSettings', '', '.settings-tab', true, () => this.updateTarget(ConfigurationTarget.USER_LOCAL));
269+
this.userLocalSettings = this._register(new Action('userSettings', '', '.settings-tab', true, () => this.updateTarget(ConfigurationTarget.USER_LOCAL)));
270270
this.userLocalSettings.tooltip = localize('userSettings', "User");
271271

272-
this.userRemoteSettings = new Action('userSettingsRemote', '', '.settings-tab', true, () => this.updateTarget(ConfigurationTarget.USER_REMOTE));
272+
this.userRemoteSettings = this._register(new Action('userSettingsRemote', '', '.settings-tab', true, () => this.updateTarget(ConfigurationTarget.USER_REMOTE)));
273273
const remoteAuthority = this.environmentService.remoteAuthority;
274274
const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
275275
this.userRemoteSettings.tooltip = localize('userSettingsRemote', "Remote") + (hostLabel ? ` [${hostLabel}]` : '');
276276

277-
this.workspaceSettings = new Action('workspaceSettings', '', '.settings-tab', false, () => this.updateTarget(ConfigurationTarget.WORKSPACE));
277+
this.workspaceSettings = this._register(new Action('workspaceSettings', '', '.settings-tab', false, () => this.updateTarget(ConfigurationTarget.WORKSPACE)));
278278

279-
this.folderSettingsAction = new Action('folderSettings', '', '.settings-tab', false, async folder => {
279+
this.folderSettingsAction = this._register(new Action('folderSettings', '', '.settings-tab', false, async folder => {
280280
this.updateTarget(isWorkspaceFolder(folder) ? folder.uri : ConfigurationTarget.USER_LOCAL);
281-
});
282-
this.folderSettings = this.instantiationService.createInstance(FolderSettingsActionViewItem, this.folderSettingsAction);
281+
}));
282+
this.folderSettings = this._register(this.instantiationService.createInstance(FolderSettingsActionViewItem, this.folderSettingsAction));
283283

284284
this.resetLabels();
285285
this.update();

0 commit comments

Comments
 (0)