@codingame/monaco-vscode-scm-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -1,14 +1,15 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/scm.css.js';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from 'vscode/vscode/vs/base/browser/dom';
 import { asCSSUrl } from 'vscode/vscode/vs/base/browser/cssValue';
-import { VIEW_PANE_ID, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/labels';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -22,21 +23,23 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { ActionRunner, Action, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenuToInlineActionBar, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMResource, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from 'vscode/vscode/vs/base/common/async';
-import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/base/common/resourceTree';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from 'vscode/vscode/vs/base/common/comparers';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { localize } from 'vscode/vscode/vs/nls';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
@@ -53,13 +56,15 @@ import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/link
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DEFAULT_FONT_FAMILY } from 'vscode/vscode/vs/base/browser/fonts';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { AnchorAlignment } from 'vscode/vscode/vs/base/browser/ui/contextview/contextview';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
 import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
-import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
-import { createAndFillInActionBarActions, createActionViewItem, createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { getFlatActionBarActions, createActionViewItem, getFlatContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MarkdownRenderer, openLinkFromMarkdown } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { ButtonWithDropdown, Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -72,18 +77,18 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from 'vscode/vscode/vs/p
 import { InlineCompletionsController } from 'vscode/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { fillEditorsDragData } from 'vscode/vscode/vs/workbench/browser/dnd';
+import { fillEditorsDragData } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/browser/dnd';
 import { CodeDataTransfers } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
 import { FormatOnType } from 'vscode/vscode/vs/editor/contrib/format/browser/formatActions';
-import { EditorOptions } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { EditorOptions, EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from 'vscode/vscode/vs/base/common/numbers';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
-import { OpenScmGroupAction } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController';
 import { GlyphHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import 'vscode/vscode/vs/base/common/arrays';
@@ -143,23 +148,23 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         this.commandService = commandService;
         this.contextMenuService = contextMenuService;
         this.notificationService = notificationService;
-        this.actionButtons = ( (new Map()));
+        this.actionButtons = ( new Map());
     }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
         container.parentElement.parentElement.classList.add('cursor-default', 'force-no-hover');
         const buttonContainer = append(container, $('.button-container'));
-        const actionButton = ( (new SCMActionButton(
+        const actionButton = ( new SCMActionButton(
             buttonContainer,
             this.contextMenuService,
             this.commandService,
             this.notificationService
-        )));
+        ));
         return { actionButton, disposable: Disposable.None, templateDisposable: actionButton };
     }
     renderElement(node, index, templateData, height) {
         templateData.disposable.dispose();
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const actionButton = node.element;
         templateData.actionButton.setButton(node.element.button);
         this.actionButtons.set(actionButton, templateData.actionButton);
@@ -167,7 +172,7 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         templateData.disposable = disposables;
     }
     renderCompressedElements() {
-        throw ( (new Error('Should never happen since node is incompressible')));
+        throw ( new Error('Should never happen since node is incompressible'));
     }
     focusActionButton(actionButton) {
         this.actionButtons.get(actionButton)?.focus();
@@ -180,20 +185,18 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         templateData.templateDisposable.dispose();
     }
 };
-ActionButtonRenderer = ActionButtonRenderer_1 = ( (__decorate([
-    ( (__param(0, ICommandService))),
-    ( (__param(1, IContextMenuService))),
-    ( (__param(2, INotificationService)))
-], ActionButtonRenderer)));
+ActionButtonRenderer = ActionButtonRenderer_1 = ( __decorate([
+    ( __param(0, ICommandService)),
+    ( __param(1, IContextMenuService)),
+    ( __param(2, INotificationService))
+], ActionButtonRenderer));
 class SCMTreeDragAndDrop {
     constructor(instantiationService) {
         this.instantiationService = instantiationService;
     }
     getDragURI(element) {
         if (isSCMResource(element)) {
-            return (
-                 (element.sourceUri.toString())
-            );
+            return ( element.sourceUri.toString());
         }
         return null;
     }
@@ -201,7 +204,7 @@ class SCMTreeDragAndDrop {
         const items = SCMTreeDragAndDrop.getResourcesFromDragAndDropData(data);
         if (originalEvent.dataTransfer && items?.length) {
             this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, items, originalEvent));
-            const fileResources = ( (items.filter(s => s.scheme === Schemas.file).map(r => r.fsPath)));
+            const fileResources = ( items.filter(s => s.scheme === Schemas.file).map(r => r.fsPath));
             if (fileResources.length) {
                 originalEvent.dataTransfer.setData(CodeDataTransfers.FILES, JSON.stringify(fileResources));
             }
@@ -241,18 +244,18 @@ let InputRenderer = class InputRenderer {
         this.overflowWidgetsDomNode = overflowWidgetsDomNode;
         this.updateHeight = updateHeight;
         this.instantiationService = instantiationService;
-        this.inputWidgets = ( (new Map()));
-        this.contentHeights = ( (new WeakMap()));
-        this.editorSelections = ( (new WeakMap()));
+        this.inputWidgets = ( new Map());
+        this.contentHeights = ( new WeakMap());
+        this.editorSelections = ( new WeakMap());
     }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-no-twistie');
         container.parentElement.parentElement.classList.add('force-no-hover');
-        const templateDisposable = ( (new DisposableStore()));
+        const templateDisposable = ( new DisposableStore());
         const inputElement = append(container, $('.scm-input'));
         const inputWidget = this.instantiationService.createInstance(SCMInputWidget, inputElement, this.overflowWidgetsDomNode);
         templateDisposable.add(inputWidget);
-        return { inputWidget, inputWidgetHeight: InputRenderer_1.DEFAULT_HEIGHT, elementDisposables: ( (new DisposableStore())), templateDisposable };
+        return { inputWidget, inputWidgetHeight: InputRenderer_1.DEFAULT_HEIGHT, elementDisposables: ( new DisposableStore()), templateDisposable };
     }
     renderElement(node, index, templateData) {
         const input = node.element;
@@ -291,7 +294,7 @@ let InputRenderer = class InputRenderer {
         layoutEditor();
     }
     renderCompressedElements() {
-        throw ( (new Error('Should never happen since node is incompressible')));
+        throw ( new Error('Should never happen since node is incompressible'));
     }
     disposeElement(group, index, template) {
         template.elementDisposables.clear();
@@ -319,39 +322,55 @@ let InputRenderer = class InputRenderer {
         }
     }
 };
-InputRenderer = InputRenderer_1 = ( (__decorate([
-    ( (__param(3, IInstantiationService)))
-], InputRenderer)));
+InputRenderer = InputRenderer_1 = ( __decorate([
+    ( __param(3, IInstantiationService))
+], InputRenderer));
 let ResourceGroupRenderer = class ResourceGroupRenderer {
     static { ResourceGroupRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'resource group'; }
     get templateId() { return ResourceGroupRenderer_1.TEMPLATE_ID; }
-    constructor(actionViewItemProvider, scmViewService) {
+    constructor(actionViewItemProvider, commandService, contextKeyService, contextMenuService, keybindingService, menuService, scmViewService, telemetryService) {
         this.actionViewItemProvider = actionViewItemProvider;
+        this.commandService = commandService;
+        this.contextKeyService = contextKeyService;
+        this.contextMenuService = contextMenuService;
+        this.keybindingService = keybindingService;
+        this.menuService = menuService;
         this.scmViewService = scmViewService;
+        this.telemetryService = telemetryService;
     }
     renderTemplate(container) {
         container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
         const element = append(container, $('.resource-group'));
         const name = append(element, $('.name'));
         const actionsContainer = append(element, $('.actions'));
-        const actionBar = ( (new ActionBar(actionsContainer, { actionViewItemProvider: this.actionViewItemProvider })));
+        const actionBar = ( new WorkbenchToolBar(
+            actionsContainer,
+            { actionViewItemProvider: this.actionViewItemProvider },
+            this.menuService,
+            this.contextKeyService,
+            this.contextMenuService,
+            this.keybindingService,
+            this.commandService,
+            this.telemetryService
+        ));
         const countContainer = append(element, $('.count'));
-        const count = ( (new CountBadge(countContainer, {}, defaultCountBadgeStyles)));
-        const disposables = combinedDisposable(actionBar);
-        return { name, count, actionBar, elementDisposables: ( (new DisposableStore())), disposables };
+        const count = ( new CountBadge(countContainer, {}, defaultCountBadgeStyles));
+        const disposables = combinedDisposable(actionBar, count);
+        return { name, count, actionBar, elementDisposables: ( new DisposableStore()), disposables };
     }
     renderElement(node, index, template) {
         const group = node.element;
         template.name.textContent = group.label;
-        template.actionBar.clear();
-        template.actionBar.context = group;
         template.count.setCount(group.resources.length);
         const menus = this.scmViewService.menus.getRepositoryMenus(group.provider);
-        template.elementDisposables.add(connectPrimaryMenuToInlineActionBar(menus.getResourceGroupMenu(group), template.actionBar));
+        template.elementDisposables.add(connectPrimaryMenu(menus.getResourceGroupMenu(group), primary => {
+            template.actionBar.setActions(primary);
+        }, 'inline'));
+        template.actionBar.context = group;
     }
     renderCompressedElements(node, index, templateData, height) {
-        throw ( (new Error('Should never happen since node is incompressible')));
+        throw ( new Error('Should never happen since node is incompressible'));
     }
     disposeElement(group, index, template) {
         template.elementDisposables.clear();
@@ -361,9 +380,15 @@ let ResourceGroupRenderer = class ResourceGroupRenderer {
         template.disposables.dispose();
     }
 };
-ResourceGroupRenderer = ResourceGroupRenderer_1 = ( (__decorate([
-    ( (__param(1, ISCMViewService)))
-], ResourceGroupRenderer)));
+ResourceGroupRenderer = ResourceGroupRenderer_1 = ( __decorate([
+    ( __param(1, ICommandService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IKeybindingService)),
+    ( __param(5, IMenuService)),
+    ( __param(6, ISCMViewService)),
+    ( __param(7, ITelemetryService))
+], ResourceGroupRenderer));
 class RepositoryPaneActionRunner extends ActionRunner {
     constructor(getSelectedResources) {
         super();
@@ -374,9 +399,9 @@ class RepositoryPaneActionRunner extends ActionRunner {
             return super.runAction(action, context);
         }
         const selection = this.getSelectedResources();
-        const contextIsSelected = ( (selection.some(s => s === context)));
+        const contextIsSelected = ( selection.some(s => s === context));
         const actualContext = contextIsSelected ? selection : [context];
-        const args = ( (actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e]))).flat();
+        const args = ( actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e])).flat();
         await action.run(...args);
     }
 }
@@ -384,16 +409,22 @@ let ResourceRenderer = class ResourceRenderer {
     static { ResourceRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'resource'; }
     get templateId() { return ResourceRenderer_1.TEMPLATE_ID; }
-    constructor(viewMode, labels, actionViewItemProvider, actionRunner, labelService, scmViewService, themeService) {
+    constructor(viewMode, labels, actionViewItemProvider, actionRunner, commandService, contextKeyService, contextMenuService, keybindingService, labelService, menuService, scmViewService, telemetryService, themeService) {
         this.viewMode = viewMode;
         this.labels = labels;
         this.actionViewItemProvider = actionViewItemProvider;
         this.actionRunner = actionRunner;
+        this.commandService = commandService;
+        this.contextKeyService = contextKeyService;
+        this.contextMenuService = contextMenuService;
+        this.keybindingService = keybindingService;
         this.labelService = labelService;
+        this.menuService = menuService;
         this.scmViewService = scmViewService;
+        this.telemetryService = telemetryService;
         this.themeService = themeService;
-        this.disposables = ( (new DisposableStore()));
-        this.renderedResources = ( (new Map()));
+        this.disposables = ( new DisposableStore());
+        this.renderedResources = ( new Map());
         themeService.onDidColorThemeChange(this.onDidColorThemeChange, this, this.disposables);
     }
     renderTemplate(container) {
@@ -401,14 +432,14 @@ let ResourceRenderer = class ResourceRenderer {
         const name = append(element, $('.name'));
         const fileLabel = this.labels.create(name, { supportDescriptionHighlights: true, supportHighlights: true });
         const actionsContainer = append(fileLabel.element, $('.actions'));
-        const actionBar = ( (new ActionBar(actionsContainer, {
+        const actionBar = ( new WorkbenchToolBar(actionsContainer, {
             actionViewItemProvider: this.actionViewItemProvider,
             actionRunner: this.actionRunner
-        })));
+        }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService));
         const decorationIcon = append(element, $('.decoration-icon'));
-        const actionBarMenuListener = ( (new MutableDisposable()));
+        const actionBarMenuListener = ( new MutableDisposable());
         const disposables = combinedDisposable(actionBar, fileLabel, actionBarMenuListener);
-        return { element, name, fileLabel, decorationIcon, actionBar, actionBarMenu: undefined, actionBarMenuListener, elementDisposables: ( (new DisposableStore())), disposables };
+        return { element, name, fileLabel, decorationIcon, actionBar, actionBarMenu: undefined, actionBarMenuListener, elementDisposables: ( new DisposableStore()), disposables };
     }
     renderElement(node, index, template) {
         const resourceOrFolder = node.element;
@@ -416,7 +447,7 @@ let ResourceRenderer = class ResourceRenderer {
         const uri = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.uri : resourceOrFolder.sourceUri;
         const fileKind = ResourceTree.isResourceNode(resourceOrFolder) ? FileKind.FOLDER : FileKind.FILE;
         const tooltip = !ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.decorations.tooltip || '';
-        const hidePath = this.viewMode() === "tree" ;
+        const hidePath = this.viewMode() === ViewMode.Tree;
         let matches;
         let descriptionMatches;
         let strikethrough;
@@ -455,7 +486,7 @@ let ResourceRenderer = class ResourceRenderer {
     renderCompressedElements(node, index, template, height) {
         const compressed = node.element;
         const folder = compressed.elements[compressed.elements.length - 1];
-        const label = ( (compressed.elements.map(e => e.name)));
+        const label = ( compressed.elements.map(e => e.name));
         const fileKind = FileKind.FOLDER;
         const matches = createMatches(node.filterData);
         template.fileLabel.setResource({ resource: folder.uri, name: label }, {
@@ -481,9 +512,10 @@ let ResourceRenderer = class ResourceRenderer {
     }
     _renderActionBar(template, resourceOrFolder, menu) {
         if (!template.actionBarMenu || template.actionBarMenu !== menu) {
-            template.actionBar.clear();
             template.actionBarMenu = menu;
-            template.actionBarMenuListener.value = connectPrimaryMenuToInlineActionBar(menu, template.actionBar);
+            template.actionBarMenuListener.value = connectPrimaryMenu(menu, primary => {
+                template.actionBar.setActions(primary);
+            }, 'inline');
         }
         template.actionBar.context = resourceOrFolder;
     }
@@ -528,11 +560,17 @@ let ResourceRenderer = class ResourceRenderer {
         this.disposables.dispose();
     }
 };
-ResourceRenderer = ResourceRenderer_1 = ( (__decorate([
-    ( (__param(4, ILabelService))),
-    ( (__param(5, ISCMViewService))),
-    ( (__param(6, IThemeService)))
-], ResourceRenderer)));
+ResourceRenderer = ResourceRenderer_1 = ( __decorate([
+    ( __param(4, ICommandService)),
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IContextMenuService)),
+    ( __param(7, IKeybindingService)),
+    ( __param(8, ILabelService)),
+    ( __param(9, IMenuService)),
+    ( __param(10, ISCMViewService)),
+    ( __param(11, ITelemetryService)),
+    ( __param(12, IThemeService))
+], ResourceRenderer));
 class ListDelegate {
     constructor(inputRenderer) {
         this.inputRenderer = inputRenderer;
@@ -565,7 +603,7 @@ class ListDelegate {
             return ResourceRenderer.TEMPLATE_ID;
         }
         else {
-            throw ( (new Error('Unknown element')));
+            throw ( new Error('Unknown element'));
         }
     }
 }
@@ -595,7 +633,7 @@ class SCMTreeSorter {
     compare(one, other) {
         if (isSCMRepository(one)) {
             if (!isSCMRepository(other)) {
-                throw ( (new Error('Invalid comparison')));
+                throw ( new Error('Invalid comparison'));
             }
             return 0;
         }
@@ -614,13 +652,13 @@ class SCMTreeSorter {
         if (isSCMResourceGroup(one)) {
             return isSCMResourceGroup(other) ? 0 : -1;
         }
-        if (this.viewMode() === "list" ) {
-            if (this.viewSortKey() === "name" ) {
+        if (this.viewMode() === ViewMode.List) {
+            if (this.viewSortKey() === ViewSortKey.Name) {
                 const oneName = basename(one.sourceUri);
                 const otherName = basename(other.sourceUri);
                 return compareFileNames(oneName, otherName);
             }
-            if (this.viewSortKey() === "status" ) {
+            if (this.viewSortKey() === ViewSortKey.Status) {
                 const oneTooltip = one.decorations.tooltip ?? '';
                 const otherTooltip = other.decorations.tooltip ?? '';
                 if (oneTooltip !== otherTooltip) {
@@ -657,7 +695,7 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
             return element.label;
         }
         else {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 const fileName = basename(element.sourceUri);
                 const filePath = this.labelService.getUriLabel(element.sourceUri, { relative: true });
                 return [fileName, filePath];
@@ -669,12 +707,12 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
     }
     getCompressedNodeKeyboardNavigationLabel(elements) {
         const folders = elements;
-        return ( (folders.map(e => e.name))).join('/');
+        return ( folders.map(e => e.name)).join('/');
     }
 };
-SCMTreeKeyboardNavigationLabelProvider = ( (__decorate([
-    ( (__param(1, ILabelService)))
-], SCMTreeKeyboardNavigationLabelProvider)));
+SCMTreeKeyboardNavigationLabelProvider = ( __decorate([
+    ( __param(1, ILabelService))
+], SCMTreeKeyboardNavigationLabelProvider));
 function getSCMResourceId(element) {
     if (isSCMRepository(element)) {
         const provider = element.provider;
@@ -695,14 +733,14 @@ function getSCMResourceId(element) {
     else if (isSCMResource(element)) {
         const group = element.resourceGroup;
         const provider = group.provider;
-        return `resource:${provider.id}/${group.id}/${( (element.sourceUri.toString()))}`;
+        return `resource:${provider.id}/${group.id}/${( element.sourceUri.toString())}`;
     }
     else if (isSCMResourceNode(element)) {
         const group = element.context;
-        return `folder:${group.provider.id}/${group.id}/$FOLDER/${( (element.uri.toString()))}`;
+        return `folder:${group.provider.id}/${group.id}/$FOLDER/${( element.uri.toString())}`;
     }
     else {
-        throw ( (new Error('Invalid tree element')));
+        throw ( new Error('Invalid tree element'));
     }
 }
 class SCMResourceIdentityProvider {
@@ -715,7 +753,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(6588, "Source Control Management"));
+        return localize(8547, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -725,7 +763,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return `${element.provider.name} ${element.provider.label}`;
         }
         else if (isSCMInput(element)) {
-            return ( localize(6589, "Source Control Input"));
+            return localize(8548, "Source Control Input");
         }
         else if (isSCMActionButton(element)) {
             return element.button?.command.title ?? '';
@@ -747,43 +785,51 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         }
     }
 };
-SCMAccessibilityProvider = ( (__decorate([
-    ( (__param(0, ILabelService)))
-], SCMAccessibilityProvider)));
+SCMAccessibilityProvider = ( __decorate([
+    ( __param(0, ILabelService))
+], SCMAccessibilityProvider));
+var ViewMode;
+(function (ViewMode) {
+    ViewMode["List"] = "list";
+    ViewMode["Tree"] = "tree";
+})(ViewMode || (ViewMode = {}));
+var ViewSortKey;
+(function (ViewSortKey) {
+    ViewSortKey["Path"] = "path";
+    ViewSortKey["Name"] = "name";
+    ViewSortKey["Status"] = "status";
+})(ViewSortKey || (ViewSortKey = {}));
 const Menus = {
-    ViewSort: ( (new MenuId('SCMViewSort'))),
-    Repositories: ( (new MenuId('SCMRepositories'))),
-    ChangesSettings: ( (new MenuId('SCMChangesSettings'))),
+    ViewSort: ( new MenuId('SCMViewSort')),
+    Repositories: ( new MenuId('SCMRepositories')),
+    ChangesSettings: ( new MenuId('SCMChangesSettings')),
 };
 const ContextKeys = {
-    SCMViewMode: ( (new RawContextKey('scmViewMode', "list" ))),
-    SCMViewSortKey: ( (new RawContextKey('scmViewSortKey', "path" ))),
-    SCMViewAreAllRepositoriesCollapsed: ( (new RawContextKey('scmViewAreAllRepositoriesCollapsed', false))),
-    SCMViewIsAnyRepositoryCollapsible: ( (new RawContextKey('scmViewIsAnyRepositoryCollapsible', false))),
-    SCMProvider: ( (new RawContextKey('scmProvider', undefined))),
-    SCMProviderRootUri: ( (new RawContextKey('scmProviderRootUri', undefined))),
-    SCMProviderHasRootUri: ( (new RawContextKey('scmProviderHasRootUri', undefined))),
-    SCMHistoryItemCount: ( (new RawContextKey('scmHistoryItemCount', 0))),
-    RepositoryCount: ( (new RawContextKey('scmRepositoryCount', 0))),
-    RepositoryVisibilityCount: ( (new RawContextKey('scmRepositoryVisibleCount', 0))),
+    SCMViewMode: ( new RawContextKey('scmViewMode', ViewMode.List)),
+    SCMViewSortKey: ( new RawContextKey('scmViewSortKey', ViewSortKey.Path)),
+    SCMViewAreAllRepositoriesCollapsed: ( new RawContextKey('scmViewAreAllRepositoriesCollapsed', false)),
+    SCMViewIsAnyRepositoryCollapsible: ( new RawContextKey('scmViewIsAnyRepositoryCollapsible', false)),
+    SCMProvider: ( new RawContextKey('scmProvider', undefined)),
+    SCMProviderRootUri: ( new RawContextKey('scmProviderRootUri', undefined)),
+    SCMProviderHasRootUri: ( new RawContextKey('scmProviderHasRootUri', undefined)),
+    SCMHistoryItemCount: ( new RawContextKey('scmHistoryItemCount', 0)),
+    SCMCurrentHistoryItemRefHasRemote: ( new RawContextKey('scmCurrentHistoryItemRefHasRemote', false)),
+    SCMCurrentHistoryItemRefInFilter: ( new RawContextKey('scmCurrentHistoryItemRefInFilter', false)),
+    RepositoryCount: ( new RawContextKey('scmRepositoryCount', 0)),
+    RepositoryVisibilityCount: ( new RawContextKey('scmRepositoryVisibleCount', 0)),
     RepositoryVisibility(repository) {
-        return (
-             (new RawContextKey(`scmRepositoryVisible:${repository.provider.id}`, false))
-        );
+        return ( new RawContextKey(`scmRepositoryVisible:${repository.provider.id}`, false));
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(6590, "View & Sort")),
+    title: ( localize(8549, "View & Sort")),
     submenu: Menus.ViewSort,
-    when: ( (ContextKeyExpr.and(
-         (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-         (ContextKeys.RepositoryCount.notEqualsTo(0))
-    ))),
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
     group: '0_view&sort',
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(6591, "Repositories")),
+    title: ( localize(8550, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -794,11 +840,8 @@ class RepositoryVisibilityAction extends Action2 {
             id: `workbench.scm.action.toggleRepositoryVisibility.${repository.provider.id}`,
             title: repository.provider.name,
             f1: false,
-            precondition: ( (ContextKeyExpr.or(
-                 (ContextKeys.RepositoryVisibilityCount.notEqualsTo(1)),
-                 (ContextKeys.RepositoryVisibility(repository).isEqualTo(false))
-            ))),
-            toggled: ( (ContextKeys.RepositoryVisibility(repository).isEqualTo(true))),
+            precondition: ( ContextKeyExpr.or(( ContextKeys.RepositoryVisibilityCount.notEqualsTo(1)), ( ContextKeys.RepositoryVisibility(repository).isEqualTo(false)))),
+            toggled: ( ContextKeys.RepositoryVisibility(repository).isEqualTo(true)),
             menu: { id: Menus.Repositories, group: '0_repositories' }
         });
         this.repository = repository;
@@ -812,8 +855,8 @@ let RepositoryVisibilityActionController = class RepositoryVisibilityActionContr
     constructor(contextKeyService, scmViewService, scmService) {
         this.contextKeyService = contextKeyService;
         this.scmViewService = scmViewService;
-        this.items = ( (new Map()));
-        this.disposables = ( (new DisposableStore()));
+        this.items = ( new Map());
+        this.disposables = ( new DisposableStore());
         this.repositoryCountContextKey = ContextKeys.RepositoryCount.bindTo(contextKeyService);
         this.repositoryVisibilityCountContextKey = ContextKeys.RepositoryVisibilityCount.bindTo(contextKeyService);
         scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.disposables);
@@ -859,46 +902,42 @@ let RepositoryVisibilityActionController = class RepositoryVisibilityActionContr
     }
     updateRepositoryContextKeys() {
         this.repositoryCountContextKey.set(this.items.size);
-        this.repositoryVisibilityCountContextKey.set(Iterable.reduce(( (this.items.keys())), (r, repository) => r + (this.scmViewService.isVisible(repository) ? 1 : 0), 0));
+        this.repositoryVisibilityCountContextKey.set(Iterable.reduce(( this.items.keys()), (r, repository) => r + (this.scmViewService.isVisible(repository) ? 1 : 0), 0));
     }
     dispose() {
         this.disposables.dispose();
-        dispose(( (this.items.values())));
+        dispose(( this.items.values()));
         this.items.clear();
     }
 };
-RepositoryVisibilityActionController = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, ISCMViewService))),
-    ( (__param(2, ISCMService)))
-], RepositoryVisibilityActionController)));
+RepositoryVisibilityActionController = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, ISCMViewService)),
+    ( __param(2, ISCMService))
+], RepositoryVisibilityActionController));
 class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6592, "View as List")),
+            title: ( localize(8551, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
-            toggled: ( (ContextKeys.SCMViewMode.isEqualTo("list" ))),
+            toggled: ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.List)),
             menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
-        view.viewMode = "list" ;
+        view.viewMode = ViewMode.List;
     }
 }
 class SetListViewModeNavigationAction extends SetListViewModeAction {
     constructor() {
         super('workbench.scm.action.setListViewModeNavigation', {
             id: MenuId.SCMTitle,
-            when: ( (ContextKeyExpr.and(
-                 (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-                 (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo("tree" ))
-            ))),
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)), ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree)))),
             group: 'navigation',
-            order: -1000
+            order: -1e3
         });
     }
 }
@@ -906,29 +945,25 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6593, "View as Tree")),
+            title: ( localize(8552, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
-            toggled: ( (ContextKeys.SCMViewMode.isEqualTo("tree" ))),
+            toggled: ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree)),
             menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
-        view.viewMode = "tree" ;
+        view.viewMode = ViewMode.Tree;
     }
 }
 class SetTreeViewModeNavigationAction extends SetTreeViewModeAction {
     constructor() {
         super('workbench.scm.action.setTreeViewModeNavigation', {
             id: MenuId.SCMTitle,
-            when: ( (ContextKeyExpr.and(
-                 (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-                 (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo("list" ))
-            ))),
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)), ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.List)))),
             group: 'navigation',
-            order: -1000
+            order: -1e3
         });
     }
 }
@@ -943,7 +978,7 @@ class RepositorySortAction extends ViewAction {
             title,
             viewId: VIEW_PANE_ID,
             f1: false,
-            toggled: ( (RepositoryContextKeys.RepositorySortKey.isEqualTo(sortKey))),
+            toggled: ( RepositoryContextKeys.RepositorySortKey.isEqualTo(sortKey)),
             menu: [
                 {
                     id: Menus.Repositories,
@@ -963,17 +998,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super("discoveryTime" , ( localize(6594, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(8553, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super("name" , ( localize(6595, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(8554, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super("path" , ( localize(6596, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(8555, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -986,8 +1021,8 @@ class SetSortKeyAction extends ViewAction {
             title,
             viewId: VIEW_PANE_ID,
             f1: false,
-            toggled: ( (ContextKeys.SCMViewSortKey.isEqualTo(sortKey))),
-            precondition: ( (ContextKeys.SCMViewMode.isEqualTo("list" ))),
+            toggled: ( ContextKeys.SCMViewSortKey.isEqualTo(sortKey)),
+            precondition: ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.List)),
             menu: { id: Menus.ViewSort, group: '2_sort' }
         });
         this.sortKey = sortKey;
@@ -998,17 +1033,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super("name" , ( localize(6597, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(8556, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super("path" , ( localize(6598, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(8557, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super("status" , ( localize(6599, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(8558, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1018,18 +1053,14 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(6600, "Collapse All Repositories")),
+            title: ( localize(8559, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
             menu: {
                 id: MenuId.SCMTitle,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-                     (ContextKeys.SCMViewIsAnyRepositoryCollapsible.isEqualTo(true)),
-                     (ContextKeys.SCMViewAreAllRepositoriesCollapsed.isEqualTo(false))
-                )))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.SCMViewIsAnyRepositoryCollapsible.isEqualTo(true)), ( ContextKeys.SCMViewAreAllRepositoriesCollapsed.isEqualTo(false))))
             }
         });
     }
@@ -1041,18 +1072,14 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(6601, "Expand All Repositories")),
+            title: ( localize(8560, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
             menu: {
                 id: MenuId.SCMTitle,
                 group: 'navigation',
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-                     (ContextKeys.SCMViewIsAnyRepositoryCollapsible.isEqualTo(true)),
-                     (ContextKeys.SCMViewAreAllRepositoriesCollapsed.isEqualTo(true))
-                )))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.SCMViewIsAnyRepositoryCollapsible.isEqualTo(true)), ( ContextKeys.SCMViewAreAllRepositoriesCollapsed.isEqualTo(true))))
             }
         });
     }
@@ -1062,19 +1089,27 @@ class ExpandAllRepositoriesAction extends ViewAction {
 }
 registerAction2(CollapseAllRepositoriesAction);
 registerAction2(ExpandAllRepositoriesAction);
+var SCMInputWidgetCommandId;
+(function (SCMInputWidgetCommandId) {
+    SCMInputWidgetCommandId["CancelAction"] = "scm.input.cancelAction";
+})(SCMInputWidgetCommandId || (SCMInputWidgetCommandId = {}));
+var SCMInputWidgetStorageKey;
+(function (SCMInputWidgetStorageKey) {
+    SCMInputWidgetStorageKey["LastActionId"] = "scm.input.lastActionId";
+})(SCMInputWidgetStorageKey || (SCMInputWidgetStorageKey = {}));
 let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends ActionRunner {
     get runningActions() { return this._runningActions; }
     constructor(input, storageService) {
         super();
         this.input = input;
         this.storageService = storageService;
-        this._runningActions = ( (new Set()));
+        this._runningActions = ( new Set());
     }
     async runAction(action) {
         try {
             if (this.runningActions.size !== 0) {
                 this._cts?.cancel();
-                if (action.id === "scm.input.cancelAction" ) {
+                if (action.id === SCMInputWidgetCommandId.CancelAction) {
                     return;
                 }
             }
@@ -1082,24 +1117,24 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
             for (const group of this.input.repository.provider.groups) {
                 context.push({
                     resourceGroupId: group.id,
-                    resources: [...( (group.resources.map(r => r.sourceUri)))]
+                    resources: [...( group.resources.map(r => r.sourceUri))]
                 });
             }
             this._runningActions.add(action);
-            this._cts = ( (new CancellationTokenSource()));
+            this._cts = ( new CancellationTokenSource());
             await action.run(...[this.input.repository.provider.rootUri, context, this._cts.token]);
         }
         finally {
             this._runningActions.delete(action);
             if (this._runningActions.size === 0) {
-                this.storageService.store("scm.input.lastActionId" , action.id, 0 , 0 );
+                this.storageService.store(SCMInputWidgetStorageKey.LastActionId, action.id, StorageScope.PROFILE, StorageTarget.USER);
             }
         }
     }
 };
-SCMInputWidgetActionRunner = ( (__decorate([
-    ( (__param(1, IStorageService)))
-], SCMInputWidgetActionRunner)));
+SCMInputWidgetActionRunner = ( __decorate([
+    ( __param(1, IStorageService))
+], SCMInputWidgetActionRunner));
 let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar {
     get dropdownActions() { return this._dropdownActions; }
     get dropdownAction() { return this._dropdownAction; }
@@ -1109,18 +1144,18 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this.contextKeyService = contextKeyService;
         this.storageService = storageService;
         this._dropdownActions = [];
-        this._onDidChange = ( (new Emitter()));
+        this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
-        this._disposables = this._register(( (new MutableDisposable())));
-        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6602, "More Actions...")), 'codicon-chevron-down')));
-        this._cancelAction = ( (new MenuItemAction({
-            id: "scm.input.cancelAction" ,
-            title: ( localize(6603, "Cancel")),
-            icon: Codicon.debugStop,
-        }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
+        this._disposables = this._register(( new MutableDisposable()));
+        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(8561, "More Actions...")), 'codicon-chevron-down'));
+        this._cancelAction = ( new MenuItemAction({
+            id: SCMInputWidgetCommandId.CancelAction,
+            title: ( localize(8562, "Cancel")),
+            icon: Codicon.stopCircle,
+        }, undefined, undefined, undefined, undefined, contextKeyService, commandService));
     }
     setInput(input) {
-        this._disposables.value = ( (new DisposableStore()));
+        this._disposables.value = ( new DisposableStore());
         const contextKeyService = this.contextKeyService.createOverlay([
             ['scmProvider', input.repository.provider.contextValue],
             ['scmProviderRootUri', input.repository.provider.rootUri?.toString()],
@@ -1128,13 +1163,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         ]);
         const menu = this._disposables.value.add(this.menuService.createMenu(MenuId.SCMInputBox, contextKeyService, { emitEventsForSubmenuChanges: true }));
         const isEnabled = () => {
-            return (
-                 (input.repository.provider.groups.some(g => g.resources.length > 0))
-            );
+            return ( input.repository.provider.groups.some(g => g.resources.length > 0));
         };
         const updateToolbar = () => {
-            const actions = [];
-            createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, actions);
+            const actions = getFlatActionBarActions(menu.getActions({ shouldForwardArgs: true }));
             for (const action of actions) {
                 action.enabled = isEnabled();
             }
@@ -1144,7 +1176,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
                 primaryAction = actions[0];
             }
             else if (actions.length > 1) {
-                const lastActionId = this.storageService.get("scm.input.lastActionId" , 0 , '');
+                const lastActionId = this.storageService.get(SCMInputWidgetStorageKey.LastActionId, StorageScope.PROFILE, '');
                 primaryAction = actions.find(a => a.id === lastActionId) ?? actions[0];
             }
             this._dropdownActions = actions.length === 1 ? [] : actions;
@@ -1153,8 +1185,8 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         };
         this._disposables.value.add(menu.onDidChange(() => updateToolbar()));
         this._disposables.value.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
-        this._disposables.value.add(this.storageService.onDidChangeValue(0 , "scm.input.lastActionId" , this._disposables.value)(() => updateToolbar()));
-        this.actionRunner = ( (new SCMInputWidgetActionRunner(input, this.storageService)));
+        this._disposables.value.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this._disposables.value)(() => updateToolbar()));
+        this.actionRunner = ( new SCMInputWidgetActionRunner(input, this.storageService));
         this._disposables.value.add(this.actionRunner.onWillRun(e => {
             if (this.actionRunner.runningActions.size === 0) {
                 super.setActions([this._cancelAction], []);
@@ -1169,23 +1201,23 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         updateToolbar();
     }
 };
-SCMInputWidgetToolbar = ( (__decorate([
-    ( (__param(2, IMenuService))),
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IContextMenuService))),
-    ( (__param(5, ICommandService))),
-    ( (__param(6, IKeybindingService))),
-    ( (__param(7, IStorageService))),
-    ( (__param(8, ITelemetryService)))
-], SCMInputWidgetToolbar)));
+SCMInputWidgetToolbar = ( __decorate([
+    ( __param(2, IMenuService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, ICommandService)),
+    ( __param(6, IKeybindingService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, ITelemetryService))
+], SCMInputWidgetToolbar));
 class SCMInputWidgetEditorOptions {
     constructor(overflowWidgetsDomNode, configurationService) {
         this.overflowWidgetsDomNode = overflowWidgetsDomNode;
         this.configurationService = configurationService;
-        this._onDidChange = ( (new Emitter()));
+        this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this.defaultInputFontFamily = DEFAULT_FONT_FAMILY;
-        this._disposables = ( (new DisposableStore()));
+        this._disposables = ( new DisposableStore());
         const onDidChangeConfiguration = Event.filter(this.configurationService.onDidChangeConfiguration, e => {
             return e.affectsConfiguration('editor.accessibilitySupport') ||
                 e.affectsConfiguration('editor.cursorBlinking') ||
@@ -1262,9 +1294,9 @@ class SCMInputWidgetEditorOptions {
 let SCMInputWidget = class SCMInputWidget {
     static { SCMInputWidget_1 = this; }
     static { this.ValidationTimeouts = {
-        [2 ]: 5000,
-        [1 ]: 8000,
-        [0 ]: 10000
+        [InputValidationType.Information]: 5000,
+        [InputValidationType.Warning]: 8000,
+        [InputValidationType.Error]: 10000
     }; }
     get input() {
         return this.model?.input;
@@ -1285,9 +1317,9 @@ let SCMInputWidget = class SCMInputWidget {
         const textModel = input.repository.provider.inputBoxTextModel;
         this.inputEditor.setModel(textModel);
         if (this.configurationService.getValue('editor.wordBasedSuggestions', { resource: textModel.uri }) !== 'off') {
-            this.configurationService.updateValue('editor.wordBasedSuggestions', 'off', { resource: textModel.uri }, 8 );
+            this.configurationService.updateValue('editor.wordBasedSuggestions', 'off', { resource: textModel.uri }, ConfigurationTarget.MEMORY);
         }
-        const validationDelayer = ( (new ThrottledDelayer(200)));
+        const validationDelayer = ( new ThrottledDelayer(200));
         const validate = async () => {
             const position = this.inputEditor.getSelection()?.getStartPosition();
             const offset = position && textModel.getOffsetAt(position);
@@ -1298,7 +1330,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.add(validationDelayer);
         this.repositoryDisposables.add(this.inputEditor.onDidChangeCursorPosition(triggerValidation));
         const opts = this.modelService.getCreationOptions(textModel.getLanguageId(), textModel.uri, textModel.isForSimpleWidget);
-        const onEnter = Event.filter(this.inputEditor.onKeyDown, e => e.keyCode === 3 , this.repositoryDisposables);
+        const onEnter = Event.filter(this.inputEditor.onKeyDown, e => e.keyCode === KeyCode.Enter, this.repositoryDisposables);
         this.repositoryDisposables.add(onEnter(() => textModel.detectIndentation(opts.insertSpaces, opts.tabSize)));
         textModel.setValue(input.value);
         this.repositoryDisposables.add(input.onDidChange(({ value, reason }) => {
@@ -1381,8 +1413,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.scmViewService = scmViewService;
         this.contextViewService = contextViewService;
         this.openerService = openerService;
-        this.disposables = ( (new DisposableStore()));
-        this.repositoryDisposables = ( (new DisposableStore()));
+        this.disposables = ( new DisposableStore());
+        this.repositoryDisposables = ( new DisposableStore());
         this.validationHasFocus = false;
         this.lastLayoutWasTrash = false;
         this.shouldFocusAfterLayout = false;
@@ -1391,7 +1423,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.toolbarContainer = append(this.element, $('.scm-editor-toolbar'));
         this.contextKeyService = contextKeyService.createScoped(this.element);
         this.repositoryIdContextKey = this.contextKeyService.createKey('scmRepository', undefined);
-        this.inputEditorOptions = ( (new SCMInputWidgetEditorOptions(overflowWidgetsDomNode, this.configurationService)));
+        this.inputEditorOptions = ( new SCMInputWidgetEditorOptions(overflowWidgetsDomNode, this.configurationService));
         this.disposables.add(this.inputEditorOptions.onDidChange(this.onDidChangeEditorOptions, this));
         this.disposables.add(this.inputEditorOptions);
         const codeEditorWidgetOptions = {
@@ -1417,7 +1449,7 @@ let SCMInputWidget = class SCMInputWidget {
             ]),
             isSimpleWidget: true
         };
-        const services = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
+        const services = ( new ServiceCollection([IContextKeyService, this.contextKeyService]));
         const instantiationService2 = instantiationService.createChild(services, this.disposables);
         const editorConstructionOptions = this.inputEditorOptions.getEditorConstructionOptions();
         this.inputEditor = instantiationService2.createInstance(CodeEditorWidget, this.editorContainer, editorConstructionOptions, codeEditorWidgetOptions);
@@ -1471,8 +1503,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.disposables.add(this.toolbar);
     }
     getContentHeight() {
-        const lineHeight = this.inputEditor.getOption(68 );
-        const { top, bottom } = this.inputEditor.getOption(86 );
+        const lineHeight = this.inputEditor.getOption(EditorOption.lineHeight);
+        const { top, bottom } = this.inputEditor.getOption(EditorOption.padding);
         const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
         const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
         const editorMinHeight = inputMinLines * lineHeight + top + bottom;
@@ -1484,7 +1516,7 @@ let SCMInputWidget = class SCMInputWidget {
     layout() {
         const editorHeight = this.getContentHeight();
         const toolbarWidth = this.getToolbarWidth();
-        const dimension = ( (new Dimension(this.element.clientWidth - toolbarWidth, editorHeight)));
+        const dimension = ( new Dimension(this.element.clientWidth - toolbarWidth, editorHeight));
         if (dimension.width < 0) {
             this.lastLayoutWasTrash = true;
             return;
@@ -1516,22 +1548,22 @@ let SCMInputWidget = class SCMInputWidget {
     }
     renderValidation() {
         this.clearValidation();
-        this.element.classList.toggle('validation-info', this.validation?.type === 2 );
-        this.element.classList.toggle('validation-warning', this.validation?.type === 1 );
-        this.element.classList.toggle('validation-error', this.validation?.type === 0 );
+        this.element.classList.toggle('validation-info', this.validation?.type === InputValidationType.Information);
+        this.element.classList.toggle('validation-warning', this.validation?.type === InputValidationType.Warning);
+        this.element.classList.toggle('validation-error', this.validation?.type === InputValidationType.Error);
         if (!this.validation || !this.inputEditor.hasTextFocus()) {
             return;
         }
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         this.validationContextView = this.contextViewService.showContextView({
             getAnchor: () => this.element,
             render: container => {
                 this.element.style.borderBottomLeftRadius = '0';
                 this.element.style.borderBottomRightRadius = '0';
                 const validationContainer = append(container, $('.scm-editor-validation-container'));
-                validationContainer.classList.toggle('validation-info', this.validation.type === 2 );
-                validationContainer.classList.toggle('validation-warning', this.validation.type === 1 );
-                validationContainer.classList.toggle('validation-error', this.validation.type === 0 );
+                validationContainer.classList.toggle('validation-info', this.validation.type === InputValidationType.Information);
+                validationContainer.classList.toggle('validation-warning', this.validation.type === InputValidationType.Warning);
+                validationContainer.classList.toggle('validation-error', this.validation.type === InputValidationType.Error);
                 validationContainer.style.width = `${this.element.clientWidth + 2}px`;
                 const element = append(validationContainer, $('.scm-editor-validation'));
                 const message = this.validation.message;
@@ -1564,12 +1596,12 @@ let SCMInputWidget = class SCMInputWidget {
                     element.appendChild(renderedMarkdown.element);
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
-                const actionbar = ( (new ActionBar(actionsContainer)));
-                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6604, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const actionbar = ( new ActionBar(actionsContainer));
+                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(8563, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
-                })));
+                }));
                 disposables.add(actionbar);
                 actionbar.push(action, { icon: true, label: false });
                 return Disposable.None;
@@ -1580,7 +1612,7 @@ let SCMInputWidget = class SCMInputWidget {
                 this.element.style.borderBottomRightRadius = '2px';
                 disposables.dispose();
             },
-            anchorAlignment: 0
+            anchorAlignment: AnchorAlignment.LEFT
         });
     }
     getToolbarWidth() {
@@ -1604,16 +1636,16 @@ let SCMInputWidget = class SCMInputWidget {
         this.disposables.dispose();
     }
 };
-SCMInputWidget = SCMInputWidget_1 = ( (__decorate([
-    ( (__param(2, IContextKeyService))),
-    ( (__param(3, IModelService))),
-    ( (__param(4, IKeybindingService))),
-    ( (__param(5, IConfigurationService))),
-    ( (__param(6, IInstantiationService))),
-    ( (__param(7, ISCMViewService))),
-    ( (__param(8, IContextViewService))),
-    ( (__param(9, IOpenerService)))
-], SCMInputWidget)));
+SCMInputWidget = SCMInputWidget_1 = ( __decorate([
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IModelService)),
+    ( __param(4, IKeybindingService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IInstantiationService)),
+    ( __param(7, ISCMViewService)),
+    ( __param(8, IContextViewService)),
+    ( __param(9, IOpenerService))
+], SCMInputWidget));
 let SCMViewPane = class SCMViewPane extends ViewPane {
     get viewMode() { return this._viewMode; }
     set viewMode(mode) {
@@ -1627,7 +1659,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this._onDidChangeViewMode.fire(mode);
         this.viewModeContextKey.set(mode);
         this.updateIndentStyles(this.themeService.getFileIconTheme());
-        this.storageService.store(`scm.viewMode`, mode, 1 , 0 );
+        this.storageService.store(`scm.viewMode`, mode, StorageScope.WORKSPACE, StorageTarget.USER);
     }
     get viewSortKey() { return this._viewSortKey; }
     set viewSortKey(sortKey) {
@@ -1638,8 +1670,8 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.updateChildren();
         this.viewSortKeyContextKey.set(sortKey);
         this._onDidChangeViewSortKey.fire(sortKey);
-        if (this._viewMode === "list" ) {
-            this.storageService.store(`scm.viewSortKey`, sortKey, 1 , 0 );
+        if (this._viewMode === ViewMode.List) {
+            this.storageService.store(`scm.viewSortKey`, sortKey, StorageScope.WORKSPACE, StorageTarget.USER);
         }
     }
     constructor(options, commandService, editorService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
@@ -1651,16 +1683,16 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.scmViewService = scmViewService;
         this.storageService = storageService;
         this.uriIdentityService = uriIdentityService;
-        this._onDidChangeViewMode = ( (new Emitter()));
+        this._onDidChangeViewMode = ( new Emitter());
         this.onDidChangeViewMode = this._onDidChangeViewMode.event;
-        this._onDidChangeViewSortKey = ( (new Emitter()));
+        this._onDidChangeViewSortKey = ( new Emitter());
         this.onDidChangeViewSortKey = this._onDidChangeViewSortKey.event;
-        this.items = ( (new DisposableMap()));
-        this.visibilityDisposables = ( (new DisposableStore()));
-        this.treeOperationSequencer = ( (new Sequencer()));
-        this.revealResourceThrottler = ( (new Throttler()));
-        this.updateChildrenThrottler = ( (new Throttler()));
-        this.disposables = ( (new DisposableStore()));
+        this.items = ( new DisposableMap());
+        this.visibilityDisposables = ( new DisposableStore());
+        this.treeOperationSequencer = ( new Sequencer());
+        this.revealResourceThrottler = ( new Throttler());
+        this.updateChildrenThrottler = ( new Throttler());
+        this.disposables = ( new DisposableStore());
         this._viewMode = this.getViewMode();
         this._viewSortKey = this.getViewSortKey();
         this.viewModeContextKey = ContextKeys.SCMViewMode.bindTo(contextKeyService);
@@ -1672,9 +1704,9 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.scmProviderContextKey = ContextKeys.SCMProvider.bindTo(contextKeyService);
         this.scmProviderRootUriContextKey = ContextKeys.SCMProviderRootUri.bindTo(contextKeyService);
         this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
-        this._onDidLayout = ( (new Emitter()));
+        this._onDidLayout = ( new Emitter());
         this.layoutCache = { height: undefined, width: undefined, onDidChange: this._onDidLayout.event };
-        this.storageService.onDidChangeValue(1 , undefined, this.disposables)(e => {
+        this.storageService.onDidChangeValue(StorageScope.WORKSPACE, undefined, this.disposables)(e => {
             switch (e.key) {
                 case 'scm.viewMode':
                     this.viewMode = this.getViewMode();
@@ -1746,7 +1778,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             }
             else {
                 this.visibilityDisposables.clear();
-                this.onDidChangeVisibleRepositories({ added: Iterable.empty(), removed: [...( (this.items.keys()))] });
+                this.onDidChangeVisibleRepositories({ added: Iterable.empty(), removed: [...( this.items.keys())] });
                 this.treeScrollTop = this.tree.scrollTop;
                 this.updateRepositoryCollapseAllContextKeys();
             }
@@ -1766,13 +1798,13 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.actionButtonRenderer = this.instantiationService.createInstance(ActionButtonRenderer);
         this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
         this.disposables.add(this.listLabels);
-        const resourceActionRunner = ( (new RepositoryPaneActionRunner(() => this.getSelectedResources())));
+        const resourceActionRunner = ( new RepositoryPaneActionRunner(() => this.getSelectedResources()));
         resourceActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
         this.disposables.add(resourceActionRunner);
         const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
         this.disposables.add(treeDataSource);
         const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
-        this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM Tree Repo', container, ( (new ListDelegate(this.inputRenderer))), ( (new SCMTreeCompressionDelegate())), [
+        this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM Tree Repo', container, ( new ListDelegate(this.inputRenderer)), ( new SCMTreeCompressionDelegate()), [
             this.inputRenderer,
             this.actionButtonRenderer,
             this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMTitle, getActionViewItemProvider(this.instantiationService)),
@@ -1782,10 +1814,10 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             horizontalScrolling: false,
             setRowLineHeight: false,
             transformOptimization: false,
-            filter: ( (new SCMTreeFilter())),
-            dnd: ( (new SCMTreeDragAndDrop(this.instantiationService))),
-            identityProvider: ( (new SCMResourceIdentityProvider())),
-            sorter: ( (new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey))),
+            filter: ( new SCMTreeFilter()),
+            dnd: ( new SCMTreeDragAndDrop(this.instantiationService)),
+            identityProvider: ( new SCMResourceIdentityProvider()),
+            sorter: ( new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey)),
             keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             compressionEnabled: compressionEnabled.get(),
@@ -1896,12 +1928,12 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         if (!uri) {
             return;
         }
-        if (( (this.tree.getFocus().some(
-            e => isSCMResource(e) && this.uriIdentityService.extUri.isEqual(e.sourceUri, uri)
-        ))) &&
-            ( (this.tree.getSelection().some(
+        if (( this.tree.getFocus().some(
             e => isSCMResource(e) && this.uriIdentityService.extUri.isEqual(e.sourceUri, uri)
-        )))) {
+        )) &&
+            ( this.tree.getSelection().some(
+                e => isSCMResource(e) && this.uriIdentityService.extUri.isEqual(e.sourceUri, uri)
+            ))) {
             return;
         }
         this.revealResourceThrottler.queue(() => this.treeOperationSequencer.queue(async () => {
@@ -1912,7 +1944,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 }
                 for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
                     const groupItem = repository.provider.groups[j];
-                    const resource = this.viewMode === "tree"
+                    const resource = this.viewMode === ViewMode.Tree
                         ? groupItem.resourceTree.getNode(uri)?.element
                         : groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
                     if (resource) {
@@ -1928,14 +1960,14 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     onDidChangeVisibleRepositories({ added, removed }) {
         for (const repository of added) {
-            const repositoryDisposables = ( (new DisposableStore()));
+            const repositoryDisposables = ( new DisposableStore());
             repositoryDisposables.add(autorun(reader => {
                 repository.provider.actionButton.read(reader);
                 this.updateChildren(repository);
             }));
             repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
-            const resourceGroupDisposables = repositoryDisposables.add(( (new DisposableMap())));
+            const resourceGroupDisposables = repositoryDisposables.add(( new DisposableMap()));
             const onDidChangeResourceGroups = () => {
                 for (const [resourceGroup] of resourceGroupDisposables) {
                     if (!repository.provider.groups.includes(resourceGroup)) {
@@ -1943,8 +1975,8 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                     }
                 }
                 for (const resourceGroup of repository.provider.groups) {
-                    if (!( (resourceGroupDisposables.has(resourceGroup)))) {
-                        const disposableStore = ( (new DisposableStore()));
+                    if (!( resourceGroupDisposables.has(resourceGroup))) {
+                        const disposableStore = ( new DisposableStore());
                         disposableStore.add(resourceGroup.onDidChange(() => this.updateChildren(repository)));
                         disposableStore.add(resourceGroup.onDidChangeResources(() => this.updateChildren(repository)));
                         resourceGroupDisposables.set(resourceGroup, disposableStore);
@@ -1964,8 +1996,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     onListContextMenu(e) {
         if (!e.element) {
             const menu = this.menuService.getMenuActions(Menus.ViewSort, this.contextKeyService);
-            const actions = [];
-            createAndFillInContextMenuActions(menu, actions);
+            const actions = getFlatContextMenuActions(menu);
             return this.contextMenuService.showContextMenu({
                 getAnchor: () => e.anchor,
                 getActions: () => actions,
@@ -1975,12 +2006,12 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const element = e.element;
         let context = element;
         let actions = [];
-        let actionRunner = ( (new RepositoryPaneActionRunner(() => this.getSelectedResources())));
+        let actionRunner = ( new RepositoryPaneActionRunner(() => this.getSelectedResources()));
         if (isSCMRepository(element)) {
             const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
             const menu = menus.repositoryContextMenu;
             context = element.provider;
-            actionRunner = ( (new RepositoryActionRunner(() => this.getSelectedRepositories())));
+            actionRunner = ( new RepositoryActionRunner(() => this.getSelectedRepositories()));
             actions = collectContextMenuActions(menu);
         }
         else if (isSCMInput(element) || isSCMActionButton(element)) ;
@@ -2017,45 +2048,45 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     getSelectedRepositories() {
         const focusedRepositories = this.tree.getFocus().filter(r => !!r && isSCMRepository(r));
         const selectedRepositories = this.tree.getSelection().filter(r => !!r && isSCMRepository(r));
-        return Array.from(( (new Set([...focusedRepositories, ...selectedRepositories]))));
+        return Array.from(( new Set([...focusedRepositories, ...selectedRepositories])));
     }
     getSelectedResources() {
         return this.tree.getSelection()
             .filter(r => !!r && !isSCMResourceGroup(r));
     }
     getViewMode() {
-        let mode = this.configurationService.getValue('scm.defaultViewMode') === 'list' ? "list"  : "tree" ;
-        const storageMode = this.storageService.get(`scm.viewMode`, 1 );
+        let mode = this.configurationService.getValue('scm.defaultViewMode') === 'list' ? ViewMode.List : ViewMode.Tree;
+        const storageMode = this.storageService.get(`scm.viewMode`, StorageScope.WORKSPACE);
         if (typeof storageMode === 'string') {
             mode = storageMode;
         }
         return mode;
     }
     getViewSortKey() {
-        if (this._viewMode === "tree" ) {
-            return "path" ;
+        if (this._viewMode === ViewMode.Tree) {
+            return ViewSortKey.Path;
         }
         let viewSortKey;
         const viewSortKeyString = this.configurationService.getValue('scm.defaultViewSortKey');
         switch (viewSortKeyString) {
             case 'name':
-                viewSortKey = "name" ;
+                viewSortKey = ViewSortKey.Name;
                 break;
             case 'status':
-                viewSortKey = "status" ;
+                viewSortKey = ViewSortKey.Status;
                 break;
             default:
-                viewSortKey = "path" ;
+                viewSortKey = ViewSortKey.Path;
                 break;
         }
-        const storageSortKey = this.storageService.get(`scm.viewSortKey`, 1 );
+        const storageSortKey = this.storageService.get(`scm.viewSortKey`, StorageScope.WORKSPACE);
         if (typeof storageSortKey === 'string') {
             viewSortKey = storageSortKey;
         }
         return viewSortKey;
     }
     loadTreeViewState() {
-        const storageViewState = this.storageService.get('scm.viewState2', 1 );
+        const storageViewState = this.storageService.get('scm.viewState2', StorageScope.WORKSPACE);
         if (!storageViewState) {
             return undefined;
         }
@@ -2069,7 +2100,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     storeTreeViewState() {
         if (this.tree) {
-            this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), 1 , 1 );
+            this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
     }
     updateChildren(element) {
@@ -2089,15 +2120,15 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         }));
     }
     updateIndentStyles(theme) {
-        this.treeContainer.classList.toggle('list-view-mode', this.viewMode === "list" );
-        this.treeContainer.classList.toggle('tree-view-mode', this.viewMode === "tree" );
-        this.treeContainer.classList.toggle('align-icons-and-twisties', (this.viewMode === "list"  && theme.hasFileIcons) || (theme.hasFileIcons && !theme.hasFolderIcons));
-        this.treeContainer.classList.toggle('hide-arrows', this.viewMode === "tree"  && theme.hidesExplorerArrows === true);
+        this.treeContainer.classList.toggle('list-view-mode', this.viewMode === ViewMode.List);
+        this.treeContainer.classList.toggle('tree-view-mode', this.viewMode === ViewMode.Tree);
+        this.treeContainer.classList.toggle('align-icons-and-twisties', (this.viewMode === ViewMode.List && theme.hasFileIcons) || (theme.hasFileIcons && !theme.hasFolderIcons));
+        this.treeContainer.classList.toggle('hide-arrows', this.viewMode === ViewMode.Tree && theme.hidesExplorerArrows === true);
     }
     updateScmProviderContextKeys() {
         const alwaysShowRepositories = this.configurationService.getValue('scm.alwaysShowRepositories');
         if (!alwaysShowRepositories && this.items.size === 1) {
-            const provider = Iterable.first(( (this.items.keys()))).provider;
+            const provider = Iterable.first(( this.items.keys())).provider;
             this.scmProviderContextKey.set(provider.contextValue);
             this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
             this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
@@ -2114,7 +2145,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.areAllRepositoriesCollapsedContextKey.set(false);
             return;
         }
-        this.isAnyRepositoryCollapsibleContextKey.set(( (this.scmViewService.visibleRepositories.some(r => this.tree.hasNode(r) && this.tree.isCollapsible(r)))));
+        this.isAnyRepositoryCollapsibleContextKey.set(( this.scmViewService.visibleRepositories.some(r => this.tree.hasNode(r) && this.tree.isCollapsible(r))));
         this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasNode(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
     }
     collapseAllRepositories() {
@@ -2207,24 +2238,22 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     focus() {
         super.focus();
         this.treeOperationSequencer.queue(() => {
-            return (
-                 (new Promise(resolve => {
-                    if (this.isExpanded()) {
-                        if (this.tree.getFocus().length === 0) {
-                            for (const repository of this.scmViewService.visibleRepositories) {
-                                const widget = this.inputRenderer.getRenderedInputWidget(repository.input);
-                                if (widget) {
-                                    widget.focus();
-                                    resolve();
-                                    return;
-                                }
+            return ( new Promise(resolve => {
+                if (this.isExpanded()) {
+                    if (this.tree.getFocus().length === 0) {
+                        for (const repository of this.scmViewService.visibleRepositories) {
+                            const widget = this.inputRenderer.getRenderedInputWidget(repository.input);
+                            if (widget) {
+                                widget.focus();
+                                resolve();
+                                return;
                             }
                         }
-                        this.tree.domFocus();
-                        resolve();
                     }
-                }))
-            );
+                    this.tree.domFocus();
+                    resolve();
+                }
+            }));
         });
     }
     dispose() {
@@ -2234,25 +2263,25 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         super.dispose();
     }
 };
-SCMViewPane = ( (__decorate([
-    ( (__param(1, ICommandService))),
-    ( (__param(2, IEditorService))),
-    ( (__param(3, IMenuService))),
-    ( (__param(4, ISCMService))),
-    ( (__param(5, ISCMViewService))),
-    ( (__param(6, IStorageService))),
-    ( (__param(7, IUriIdentityService))),
-    ( (__param(8, IKeybindingService))),
-    ( (__param(9, IThemeService))),
-    ( (__param(10, IContextMenuService))),
-    ( (__param(11, IInstantiationService))),
-    ( (__param(12, IViewDescriptorService))),
-    ( (__param(13, IConfigurationService))),
-    ( (__param(14, IContextKeyService))),
-    ( (__param(15, IOpenerService))),
-    ( (__param(16, ITelemetryService))),
-    ( (__param(17, IHoverService)))
-], SCMViewPane)));
+SCMViewPane = ( __decorate([
+    ( __param(1, ICommandService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, IMenuService)),
+    ( __param(4, ISCMService)),
+    ( __param(5, ISCMViewService)),
+    ( __param(6, IStorageService)),
+    ( __param(7, IUriIdentityService)),
+    ( __param(8, IKeybindingService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, IContextMenuService)),
+    ( __param(11, IInstantiationService)),
+    ( __param(12, IViewDescriptorService)),
+    ( __param(13, IConfigurationService)),
+    ( __param(14, IContextKeyService)),
+    ( __param(15, IOpenerService)),
+    ( __param(16, ITelemetryService)),
+    ( __param(17, IHoverService))
+], SCMViewPane));
 let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
     constructor(viewMode, configurationService, scmViewService) {
         super();
@@ -2282,17 +2311,17 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
                     button: actionButton
                 });
             }
-            const hasSomeChanges = ( (resourceGroups.some(group => group.resources.length > 0)));
+            const hasSomeChanges = ( resourceGroups.some(group => group.resources.length > 0));
             if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !actionButton))) {
                 children.push(...resourceGroups);
             }
             return children;
         }
         else if (isSCMResourceGroup(inputOrElement)) {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 return inputOrElement.resources;
             }
-            else if (this.viewMode() === "tree" ) {
+            else if (this.viewMode() === ViewMode.Tree) {
                 const children = [];
                 for (const node of inputOrElement.resourceTree.root.children) {
                     children.push(node.element && node.childrenCount === 0 ? node.element : node);
@@ -2318,17 +2347,17 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
                 return element.parent;
             }
             else {
-                throw ( (new Error('Invalid element passed to getParent')));
+                throw ( new Error('Invalid element passed to getParent'));
             }
         }
         else if (isSCMResource(element)) {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 return element.resourceGroup;
             }
             const node = element.resourceGroup.resourceTree.getNode(element.sourceUri);
             const result = node?.parent;
             if (!result) {
-                throw ( (new Error('Invalid element passed to getParent')));
+                throw ( new Error('Invalid element passed to getParent'));
             }
             if (result === element.resourceGroup.resourceTree.root) {
                 return element.resourceGroup;
@@ -2341,12 +2370,12 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
         else if (isSCMResourceGroup(element)) {
             const repository = this.scmViewService.visibleRepositories.find(r => r.provider === element.provider);
             if (!repository) {
-                throw ( (new Error('Invalid element passed to getParent')));
+                throw ( new Error('Invalid element passed to getParent'));
             }
             return repository;
         }
         else {
-            throw ( (new Error('Unexpected call to getParent')));
+            throw ( new Error('Unexpected call to getParent'));
         }
     }
     hasChildren(inputOrElement) {
@@ -2372,21 +2401,21 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
             return inputOrElement.childrenCount > 0;
         }
         else {
-            throw ( (new Error('hasChildren not implemented.')));
+            throw ( new Error('hasChildren not implemented.'));
         }
     }
 };
-SCMTreeDataSource = ( (__decorate([
-    ( (__param(1, IConfigurationService))),
-    ( (__param(2, ISCMViewService)))
-], SCMTreeDataSource)));
+SCMTreeDataSource = ( __decorate([
+    ( __param(1, IConfigurationService)),
+    ( __param(2, ISCMViewService))
+], SCMTreeDataSource));
 class SCMActionButton {
     constructor(container, contextMenuService, commandService, notificationService) {
         this.container = container;
         this.contextMenuService = contextMenuService;
         this.commandService = commandService;
         this.notificationService = notificationService;
-        this.disposables = ( (new MutableDisposable()));
+        this.disposables = ( new MutableDisposable());
     }
     dispose() {
         this.disposables?.dispose();
@@ -2401,33 +2430,33 @@ class SCMActionButton {
             for (let index = 0; index < button.secondaryCommands.length; index++) {
                 const commands = button.secondaryCommands[index];
                 for (const command of commands) {
-                    actions.push(( (new Action(
+                    actions.push(( new Action(
                         command.id,
                         command.title,
                         undefined,
                         true,
                         async () => await this.executeCommand(command.id, ...(command.arguments || []))
-                    ))));
+                    )));
                 }
                 if (commands.length) {
-                    actions.push(( (new Separator())));
+                    actions.push(( new Separator()));
                 }
             }
             actions.pop();
-            this.button = ( (new ButtonWithDropdown(this.container, {
+            this.button = ( new ButtonWithDropdown(this.container, {
                 actions: actions,
                 addPrimaryActionToDropdown: false,
                 contextMenuProvider: this.contextMenuService,
                 title: button.command.tooltip,
                 supportIcons: true,
                 ...defaultButtonStyles
-            })));
+            }));
         }
         else {
-            this.button = ( (new Button(
+            this.button = ( new Button(
                 this.container,
                 { supportIcons: true, supportShortLabel: !!button.command.shortTitle, title: button.command.tooltip, ...defaultButtonStyles }
-            )));
+            ));
         }
         this.button.enabled = button.enabled;
         this.button.label = button.command.title;
@@ -2441,7 +2470,7 @@ class SCMActionButton {
         this.button?.focus();
     }
     clear() {
-        this.disposables.value = ( (new DisposableStore()));
+        this.disposables.value = ( new DisposableStore());
         this.button = undefined;
         clearNode(this.container);
     }