@codingame/monaco-vscode-scm-service-override 5.3.0 → 6.0.1

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

@@ -4,8 +4,8 @@ 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 { append, $, asCSSUrl, prepend, Dimension, trackFocus, isPointerEvent, clearNode } from 'vscode/vscode/vs/base/browser/dom';
-import { VIEW_PANE_ID, SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { append, $, asCSSUrl, prepend, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from 'vscode/vscode/vs/base/browser/dom';
+import { VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from 'vscode/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 { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
@@ -23,6 +23,7 @@ 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, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
 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';
@@ -31,9 +32,10 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
 import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { flatten } from 'vscode/vscode/vs/base/common/arrays';
+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 { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
@@ -54,11 +56,12 @@ import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/brows
 import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/links';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 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';
@@ -74,12 +77,11 @@ import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/brows
 import { defaultCountBadgeStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { InlineCompletionsController } from 'vscode/vscode/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
-import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { fillEditorsDragData } from 'vscode/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 { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
@@ -98,7 +100,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { WorkbenchToolBar, MenuWorkbenchToolBar } 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 { clamp } from 'vscode/vscode/vs/base/common/numbers';
+import { clamp, rot } from 'vscode/vscode/vs/base/common/numbers';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
@@ -200,30 +202,15 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         const disposables = ( (new DisposableStore()));
         const actionButton = node.element;
         templateData.actionButton.setButton(node.element.button);
-        const renderedActionButtons = this.actionButtons.get(actionButton) ?? [];
-        this.actionButtons.set(actionButton, [...renderedActionButtons, templateData.actionButton]);
-        disposables.add({
-            dispose: () => {
-                const renderedActionButtons = this.actionButtons.get(actionButton) ?? [];
-                const renderedWidgetIndex = renderedActionButtons.findIndex(renderedActionButton => renderedActionButton === templateData.actionButton);
-                if (renderedWidgetIndex < 0) {
-                    throw ( (new Error('Disposing unknown action button')));
-                }
-                if (renderedActionButtons.length === 1) {
-                    this.actionButtons.delete(actionButton);
-                }
-                else {
-                    renderedActionButtons.splice(renderedWidgetIndex, 1);
-                }
-            }
-        });
+        this.actionButtons.set(actionButton, templateData.actionButton);
+        disposables.add({ dispose: () => this.actionButtons.delete(actionButton) });
         templateData.disposable = disposables;
     }
     renderCompressedElements() {
         throw ( (new Error('Should never happen since node is incompressible')));
     }
     focusActionButton(actionButton) {
-        this.actionButtons.get(actionButton)?.forEach(renderedActionButton => renderedActionButton.focus());
+        this.actionButtons.get(actionButton)?.focus();
     }
     disposeElement(node, index, template) {
         template.disposable.dispose();
@@ -309,23 +296,10 @@ let InputRenderer = class InputRenderer {
     }
     renderElement(node, index, templateData) {
         const input = node.element;
-        templateData.inputWidget.setInput(input);
-        const renderedWidgets = this.inputWidgets.get(input) ?? [];
-        this.inputWidgets.set(input, [...renderedWidgets, templateData.inputWidget]);
+        templateData.inputWidget.input = input;
+        this.inputWidgets.set(input, templateData.inputWidget);
         templateData.elementDisposables.add({
-            dispose: () => {
-                const renderedWidgets = this.inputWidgets.get(input) ?? [];
-                const renderedWidgetIndex = renderedWidgets.findIndex(renderedWidget => renderedWidget === templateData.inputWidget);
-                if (renderedWidgetIndex < 0) {
-                    throw ( (new Error('Disposing unknown input widget')));
-                }
-                if (renderedWidgets.length === 1) {
-                    this.inputWidgets.delete(input);
-                }
-                else {
-                    renderedWidgets.splice(renderedWidgetIndex, 1);
-                }
-            }
+            dispose: () => this.inputWidgets.delete(input)
         });
         const selections = this.editorSelections.get(input);
         if (selections) {
@@ -372,20 +346,16 @@ let InputRenderer = class InputRenderer {
         return this.inputWidgets.get(input);
     }
     getFocusedInput() {
-        for (const [input, inputWidgets] of this.inputWidgets) {
-            for (const inputWidget of inputWidgets) {
-                if (inputWidget.hasFocus()) {
-                    return input;
-                }
+        for (const [input, inputWidget] of this.inputWidgets) {
+            if (inputWidget.hasFocus()) {
+                return input;
             }
         }
         return undefined;
     }
     clearValidation() {
-        for (const [, inputWidgets] of this.inputWidgets) {
-            for (const inputWidget of inputWidgets) {
-                inputWidget.clearValidation();
-            }
+        for (const [, inputWidget] of this.inputWidgets) {
+            inputWidget.clearValidation();
         }
     }
 };
@@ -446,7 +416,7 @@ class RepositoryPaneActionRunner extends ActionRunner {
         const selection = this.getSelectedResources();
         const contextIsSelected = ( (selection.some(s => s === context)));
         const actualContext = contextIsSelected ? selection : [context];
-        const args = flatten(( (actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e]))));
+        const args = ( (actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e]))).flat();
         await action.run(...args);
     }
 }
@@ -486,7 +456,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;
@@ -843,7 +813,7 @@ let HistoryItemChangeRenderer = class HistoryItemChangeRenderer {
         const historyItemChangeOrFolder = node.element;
         const uri = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? historyItemChangeOrFolder.element?.uri ?? historyItemChangeOrFolder.uri : historyItemChangeOrFolder.uri;
         const fileKind = ResourceTree.isResourceNode(historyItemChangeOrFolder) ? FileKind.FOLDER : FileKind.FILE;
-        const hidePath = this.viewMode() === "tree" ;
+        const hidePath = this.viewMode() === ViewMode.Tree;
         let matches;
         let descriptionMatches;
         if (ResourceTree.isResourceNode(historyItemChangeOrFolder)) {
@@ -1033,7 +1003,7 @@ class SCMTreeSorter {
             return 0;
         }
         if (isSCMHistoryItemChangeTreeElement(one) || isSCMHistoryItemChangeNode(one)) {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 if (!isSCMHistoryItemChangeTreeElement(other)) {
                     throw ( (new Error('Invalid comparison')));
                 }
@@ -1046,13 +1016,13 @@ class SCMTreeSorter {
             const otherName = isSCMHistoryItemChangeNode(other) ? other.name : basename(other.uri);
             return compareFileNames(oneName, otherName);
         }
-        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) {
@@ -1098,7 +1068,7 @@ let SCMTreeKeyboardNavigationLabelProvider = class SCMTreeKeyboardNavigationLabe
             return element.label;
         }
         else {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 const uri = isSCMResource(element) ? element.sourceUri : element.uri;
                 return [basename(uri), this.labelService.getUriLabel(uri, { relative: true })];
             }
@@ -1232,14 +1202,25 @@ let SCMAccessibilityProvider = class 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'))),
 };
 const ContextKeys = {
-    SCMViewMode: ( (new RawContextKey('scmViewMode', "list" ))),
-    SCMViewSortKey: ( (new RawContextKey('scmViewSortKey', "path" ))),
+    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))),
@@ -1493,12 +1474,12 @@ class SetListViewModeAction extends ViewAction {
             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 {
@@ -1508,7 +1489,7 @@ class SetListViewModeNavigationAction extends SetListViewModeAction {
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
                  (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo("tree" ))
+                 (ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree))
             ))),
             group: 'navigation',
             order: -1000
@@ -1523,12 +1504,12 @@ class SetTreeViewModeAction extends ViewAction {
             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 {
@@ -1538,7 +1519,7 @@ class SetTreeViewModeNavigationAction extends SetTreeViewModeAction {
             when: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
                  (ContextKeys.RepositoryCount.notEqualsTo(0)),
-                 (ContextKeys.SCMViewMode.isEqualTo("list" ))
+                 (ContextKeys.SCMViewMode.isEqualTo(ViewMode.List))
             ))),
             group: 'navigation',
             order: -1000
@@ -1576,17 +1557,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super("discoveryTime" , ( localizeWithPath(_moduleId, 23, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localizeWithPath(_moduleId, 23, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super("name" , ( localizeWithPath(_moduleId, 24, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localizeWithPath(_moduleId, 24, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super("path" , ( localizeWithPath(_moduleId, 25, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localizeWithPath(_moduleId, 25, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1600,7 +1581,7 @@ class SetSortKeyAction extends ViewAction {
             viewId: VIEW_PANE_ID,
             f1: false,
             toggled: ( (ContextKeys.SCMViewSortKey.isEqualTo(sortKey))),
-            precondition: ( (ContextKeys.SCMViewMode.isEqualTo("list" ))),
+            precondition: ( (ContextKeys.SCMViewMode.isEqualTo(ViewMode.List))),
             menu: { id: Menus.ViewSort, group: '2_sort' }
         });
         this.sortKey = sortKey;
@@ -1611,17 +1592,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super("name" , ( localizeWithPath(_moduleId, 26, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localizeWithPath(_moduleId, 26, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super("path" , ( localizeWithPath(_moduleId, 27, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localizeWithPath(_moduleId, 27, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super("status" , ( localizeWithPath(_moduleId, 28, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localizeWithPath(_moduleId, 28, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1675,6 +1656,14 @@ 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) {
@@ -1687,7 +1676,7 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
         try {
             if (this.runningActions.size !== 0) {
                 this._cts?.cancel();
-                if (action.id === "scm.input.cancelAction" ) {
+                if (action.id === SCMInputWidgetCommandId.CancelAction) {
                     return;
                 }
             }
@@ -1705,7 +1694,7 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
         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);
             }
         }
     }
@@ -1727,7 +1716,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this.repositoryDisposables = ( (new DisposableStore()));
         this._dropdownAction = ( (new Action('scmInputMoreActions', ( localizeWithPath(_moduleId, 31, "More Actions...")), 'codicon-chevron-down')));
         this._cancelAction = ( (new MenuItemAction({
-            id: "scm.input.cancelAction" ,
+            id: SCMInputWidgetCommandId.CancelAction,
             title: ( localizeWithPath(_moduleId, 32, "Cancel")),
             icon: Codicon.debugStop,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
@@ -1757,7 +1746,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;
@@ -1766,7 +1755,7 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         };
         this.repositoryDisposables.add(menu.onDidChange(() => updateToolbar()));
         this.repositoryDisposables.add(input.repository.provider.onDidChangeResources(() => updateToolbar()));
-        this.repositoryDisposables.add(this.storageService.onDidChangeValue(0 , "scm.input.lastActionId" , this.repositoryDisposables)(() => updateToolbar()));
+        this.repositoryDisposables.add(this.storageService.onDidChangeValue(StorageScope.PROFILE, SCMInputWidgetStorageKey.LastActionId, this.repositoryDisposables)(() => updateToolbar()));
         this.actionRunner = ( (new SCMInputWidgetActionRunner(input, this.storageService)));
         this.repositoryDisposables.add(this.actionRunner.onWillRun(e => {
             if (this.actionRunner.runningActions.size === 0) {
@@ -1875,14 +1864,14 @@ 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;
     }
-    async setInput(input) {
+    set input(input) {
         if (input === this.input) {
             return;
         }
@@ -1891,25 +1880,15 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.clear();
         this.repositoryIdContextKey.set(input?.repository.id);
         if (!input) {
-            this.model?.textModelRef?.dispose();
             this.inputEditor.setModel(undefined);
             this.model = undefined;
             return;
         }
-        const uri = input.repository.provider.inputBoxDocumentUri;
-        if (this.configurationService.getValue('editor.wordBasedSuggestions', { resource: uri }) !== 'off') {
-            this.configurationService.updateValue('editor.wordBasedSuggestions', 'off', { resource: uri }, 8 );
-        }
-        const modelValue = { input, textModelRef: undefined };
-        this.model = modelValue;
-        const modelRef = await this.textModelService.createModelReference(uri);
-        if (this.model !== modelValue) {
-            modelRef.dispose();
-            return;
-        }
-        modelValue.textModelRef = modelRef;
-        const textModel = modelRef.object.textEditorModel;
+        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 }, ConfigurationTarget.MEMORY);
+        }
         const validationDelayer = ( (new ThrottledDelayer(200)));
         const validate = async () => {
             const position = this.inputEditor.getSelection()?.getStartPosition();
@@ -1921,7 +1900,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 }) => {
@@ -1978,6 +1957,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.repositoryDisposables.add(input.onDidChangeEnablement(enabled => updateEnablement(enabled)));
         updateEnablement(input.enabled);
         this.toolbar.setInput(input);
+        this.model = { input, textModel };
     }
     get selections() {
         return this.inputEditor.getSelections();
@@ -2001,9 +1981,8 @@ let SCMInputWidget = class SCMInputWidget {
             this._validationTimer = setTimeout(() => this.setValidation(undefined), SCMInputWidget_1.ValidationTimeouts[validation.type]);
         }
     }
-    constructor(container, overflowWidgetsDomNode, contextKeyService, modelService, textModelService, keybindingService, configurationService, instantiationService, scmViewService, contextViewService, openerService, contextMenuService) {
+    constructor(container, overflowWidgetsDomNode, contextKeyService, modelService, keybindingService, configurationService, instantiationService, scmViewService, contextViewService, openerService, contextMenuService) {
         this.modelService = modelService;
-        this.textModelService = textModelService;
         this.keybindingService = keybindingService;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
@@ -2049,7 +2028,7 @@ let SCMInputWidget = class SCMInputWidget {
             ])
         };
         const services = ( (new ServiceCollection([IContextKeyService, this.contextKeyService])));
-        const instantiationService2 = instantiationService.createChild(services);
+        const instantiationService2 = instantiationService.createChild(services, this.disposables);
         this.inputEditor = instantiationService2.createInstance(CodeEditorWidget, this.editorContainer, editorConstructionOptions, codeEditorWidgetOptions);
         this.disposables.add(this.inputEditor);
         this.disposables.add(this.inputEditor.onDidFocusEditorText(() => {
@@ -2101,8 +2080,8 @@ let SCMInputWidget = class SCMInputWidget {
         this.disposables.add(this.toolbar);
     }
     getContentHeight() {
-        const lineHeight = this.inputEditor.getOption(67 );
-        const { top, bottom } = this.inputEditor.getOption(84 );
+        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;
@@ -2149,9 +2128,9 @@ 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;
         }
@@ -2162,9 +2141,9 @@ let SCMInputWidget = class SCMInputWidget {
                 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;
@@ -2213,7 +2192,7 @@ let SCMInputWidget = class SCMInputWidget {
                 this.element.style.borderBottomRightRadius = '2px';
                 disposables.dispose();
             },
-            anchorAlignment: 0
+            anchorAlignment: AnchorAlignment.LEFT
         });
     }
     getToolbarWidth() {
@@ -2236,7 +2215,7 @@ let SCMInputWidget = class SCMInputWidget {
         this.validationHasFocus = false;
     }
     dispose() {
-        this.setInput(undefined);
+        this.input = undefined;
         this.repositoryDisposables.dispose();
         this.clearValidation();
         this.disposables.dispose();
@@ -2245,14 +2224,13 @@ let SCMInputWidget = class SCMInputWidget {
 SCMInputWidget = SCMInputWidget_1 = ( (__decorate([
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IModelService))),
-    ( (__param(4, ITextModelService))),
-    ( (__param(5, IKeybindingService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IInstantiationService))),
-    ( (__param(8, ISCMViewService))),
-    ( (__param(9, IContextViewService))),
-    ( (__param(10, IOpenerService))),
-    ( (__param(11, IContextMenuService)))
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, ISCMViewService))),
+    ( (__param(8, IContextViewService))),
+    ( (__param(9, IOpenerService))),
+    ( (__param(10, IContextMenuService)))
 ], SCMInputWidget)));
 let SCMViewPane = class SCMViewPane extends ViewPane {
     get viewMode() { return this._viewMode; }
@@ -2267,7 +2245,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) {
@@ -2278,8 +2256,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, logService, menuService, scmService, scmViewService, storageService, uriIdentityService, keybindingService, themeService, contextMenuService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, telemetryService, hoverService) {
@@ -2315,7 +2293,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
         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();
@@ -2330,7 +2308,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.viewSortKey = this.getViewSortKey();
             this.storeTreeViewState();
         }, this, this.disposables);
-        this.disposables.add(this.instantiationService.createInstance(ScmInputContentProvider));
         Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository)(() => this._onDidChangeViewWelcomeState.fire(), this, this.disposables);
         this.disposables.add(this.revealResourceThrottler);
         this.disposables.add(this.updateChildrenThrottler);
@@ -2367,31 +2344,34 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.createTree(this.treeContainer, viewState);
         this.onDidChangeBodyVisibility(async (visible) => {
             if (visible) {
-                await this.tree.setInput(this.scmViewService, viewState);
-                Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.visibilityDisposables)(() => {
-                    this.updateActions();
-                    this.updateChildren();
-                }, this, this.visibilityDisposables);
-                Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.inputMinLineCount') ||
-                    e.affectsConfiguration('scm.inputMaxLineCount') ||
-                    e.affectsConfiguration('scm.showActionButton') ||
-                    e.affectsConfiguration('scm.showChangesSummary') ||
-                    e.affectsConfiguration('scm.showIncomingChanges') ||
-                    e.affectsConfiguration('scm.showOutgoingChanges'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
-                this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
-                this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.visibilityDisposables);
-                this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
-                if (typeof this.treeScrollTop === 'number') {
-                    this.tree.scrollTop = this.treeScrollTop;
-                    this.treeScrollTop = undefined;
-                }
+                this.treeOperationSequencer.queue(async () => {
+                    await this.tree.setInput(this.scmViewService, viewState);
+                    Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.visibilityDisposables)(() => {
+                        this.updateActions();
+                        this.updateChildren();
+                    }, this, this.visibilityDisposables);
+                    Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.inputMinLineCount') ||
+                        e.affectsConfiguration('scm.inputMaxLineCount') ||
+                        e.affectsConfiguration('scm.showActionButton') ||
+                        e.affectsConfiguration('scm.showChangesSummary') ||
+                        e.affectsConfiguration('scm.showIncomingChanges') ||
+                        e.affectsConfiguration('scm.showOutgoingChanges'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
+                    this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
+                    this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.visibilityDisposables);
+                    this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
+                    if (typeof this.treeScrollTop === 'number') {
+                        this.tree.scrollTop = this.treeScrollTop;
+                        this.treeScrollTop = undefined;
+                    }
+                    this.updateRepositoryCollapseAllContextKeys();
+                });
             }
             else {
                 this.visibilityDisposables.clear();
                 this.onDidChangeVisibleRepositories({ added: Iterable.empty(), removed: [...( (this.items.keys()))] });
                 this.treeScrollTop = this.tree.scrollTop;
+                this.updateRepositoryCollapseAllContextKeys();
             }
-            this.updateRepositoryCollapseAllContextKeys();
         }, this, this.disposables);
         this.disposables.add(this.instantiationService.createInstance(RepositoryVisibilityActionController));
         this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this, this.disposables);
@@ -2399,7 +2379,12 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     createTree(container, viewState) {
         const overflowWidgetsDomNode = $('.scm-overflow-widgets-container.monaco-editor');
-        this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => { this.tree.updateElementHeight(input, height); });
+        this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => {
+            try {
+                this.tree.updateElementHeight(input, height);
+            }
+            catch { }
+        });
         this.actionButtonRenderer = this.instantiationService.createInstance(ActionButtonRenderer);
         this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
         this.disposables.add(this.listLabels);
@@ -2434,7 +2419,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             sorter: ( (new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey))),
             keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
             overrideStyles: {
-                listBackground: this.viewDescriptorService.getViewLocationById(this.id) === 1  ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
+                listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
             },
             collapseByDefault: (e) => {
                 if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
@@ -2461,11 +2446,9 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         }
         else if (isSCMInput(e.element)) {
             this.scmViewService.focus(e.element.repository);
-            const widgets = this.inputRenderer.getRenderedInputWidget(e.element);
-            if (widgets) {
-                for (const widget of widgets) {
-                    widget.focus();
-                }
+            const widget = this.inputRenderer.getRenderedInputWidget(e.element);
+            if (widget) {
+                widget.focus();
                 this.tree.setFocus([], e.browserEvent);
                 const selection = this.tree.getSelection();
                 if (selection.length === 1 && selection[0] === e.element) {
@@ -2575,11 +2558,12 @@ 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) {
                         await this.tree.expandTo(resource);
+                        this.tree.reveal(resource);
                         this.tree.setSelection([resource]);
                         this.tree.setFocus([resource]);
                         return;
@@ -2712,38 +2696,38 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             .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;
         }
@@ -2757,7 +2741,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) {
@@ -2770,17 +2754,17 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 await this.tree.updateChildren(undefined);
             }
             if (focusedInput) {
-                this.inputRenderer.getRenderedInputWidget(focusedInput)?.forEach(widget => widget.focus());
+                this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
             }
             this.updateScmProviderContextKeys();
             this.updateRepositoryCollapseAllContextKeys();
         }));
     }
     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');
@@ -2819,6 +2803,73 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             }
         }
     }
+    focusPreviousInput() {
+        this.treeOperationSequencer.queue(() => this.focusInput(-1));
+    }
+    focusNextInput() {
+        this.treeOperationSequencer.queue(() => this.focusInput(1));
+    }
+    async focusInput(delta) {
+        if (!this.scmViewService.focusedRepository ||
+            this.scmViewService.visibleRepositories.length === 0) {
+            return;
+        }
+        let input = this.scmViewService.focusedRepository.input;
+        const repositories = this.scmViewService.visibleRepositories;
+        if (repositories.length === 1 && this.inputRenderer.getRenderedInputWidget(input)?.hasFocus() === true) {
+            return;
+        }
+        if (repositories.length > 1 && this.inputRenderer.getRenderedInputWidget(input)?.hasFocus() === true) {
+            const focusedRepositoryIndex = repositories.indexOf(this.scmViewService.focusedRepository);
+            const newFocusedRepositoryIndex = rot(focusedRepositoryIndex + delta, repositories.length);
+            input = repositories[newFocusedRepositoryIndex].input;
+        }
+        await this.tree.expandTo(input);
+        this.tree.reveal(input);
+        this.inputRenderer.getRenderedInputWidget(input)?.focus();
+    }
+    focusPreviousResourceGroup() {
+        this.treeOperationSequencer.queue(() => this.focusResourceGroup(-1));
+    }
+    focusNextResourceGroup() {
+        this.treeOperationSequencer.queue(() => this.focusResourceGroup(1));
+    }
+    async focusResourceGroup(delta) {
+        if (!this.scmViewService.focusedRepository ||
+            this.scmViewService.visibleRepositories.length === 0) {
+            return;
+        }
+        const treeHasDomFocus = isActiveElement(this.tree.getHTMLElement());
+        const resourceGroups = this.scmViewService.focusedRepository.provider.groups;
+        const focusedResourceGroup = this.tree.getFocus().find(e => isSCMResourceGroup(e));
+        const focusedResourceGroupIndex = treeHasDomFocus && focusedResourceGroup ? resourceGroups.indexOf(focusedResourceGroup) : -1;
+        let resourceGroupNext;
+        if (focusedResourceGroupIndex === -1) {
+            for (const resourceGroup of resourceGroups) {
+                if (this.tree.hasNode(resourceGroup)) {
+                    resourceGroupNext = resourceGroup;
+                    break;
+                }
+            }
+        }
+        else {
+            let index = rot(focusedResourceGroupIndex + delta, resourceGroups.length);
+            while (index !== focusedResourceGroupIndex) {
+                if (this.tree.hasNode(resourceGroups[index])) {
+                    resourceGroupNext = resourceGroups[index];
+                    break;
+                }
+                index = rot(index + delta, resourceGroups.length);
+            }
+        }
+        if (resourceGroupNext) {
+            await this.tree.expandTo(resourceGroupNext);
+            this.tree.reveal(resourceGroupNext);
+            this.tree.setSelection([resourceGroupNext]);
+            this.tree.setFocus([resourceGroupNext]);
+            this.tree.domFocus();
+        }
+    }
     shouldShowWelcome() {
         return this.scmService.repositoryCount === 0;
     }
@@ -2827,20 +2878,26 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
     }
     focus() {
         super.focus();
-        if (this.isExpanded()) {
-            if (this.tree.getFocus().length === 0) {
-                for (const repository of this.scmViewService.visibleRepositories) {
-                    const widgets = this.inputRenderer.getRenderedInputWidget(repository.input);
-                    if (widgets) {
-                        for (const widget of widgets) {
-                            widget.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;
+                        this.tree.domFocus();
+                        resolve();
                     }
-                }
-            }
-            this.tree.domFocus();
-        }
+                }))
+            );
+        });
     }
     dispose() {
         this.visibilityDisposables.dispose();
@@ -2967,10 +3024,10 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             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);
@@ -3111,7 +3168,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
                 historyItemChanges: historyItemChangesMap.set(`${element.id}/${historyItemParentId}`, historyItemChanges)
             });
         }
-        if (this.viewMode() === "list" ) {
+        if (this.viewMode() === ViewMode.List) {
             return (
                  (historyItemChanges.map(change => ({
                     ...change,
@@ -3151,7 +3208,7 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             }
         }
         else if (isSCMResource(element)) {
-            if (this.viewMode() === "list" ) {
+            if (this.viewMode() === ViewMode.List) {
                 return element.resourceGroup;
             }
             const node = element.resourceGroup.resourceTree.getNode(element.sourceUri);
@@ -3164,6 +3221,16 @@ let SCMTreeDataSource = class SCMTreeDataSource {
             }
             return result;
         }
+        else if (isSCMInput(element)) {
+            return element.repository;
+        }
+        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')));
+            }
+            return repository;
+        }
         else {
             throw ( (new Error('Unexpected call to getParent')));
         }
@@ -3291,25 +3358,5 @@ class SCMActionButton {
         }
     }
 }
-let ScmInputContentProvider = class ScmInputContentProvider extends Disposable {
-    constructor(textModelService, _modelService, _languageService) {
-        super();
-        this._modelService = _modelService;
-        this._languageService = _languageService;
-        this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeSourceControl, this));
-    }
-    async provideTextContent(resource) {
-        const existing = this._modelService.getModel(resource);
-        if (existing) {
-            return existing;
-        }
-        return this._modelService.createModel('', this._languageService.createById('scminput'), resource);
-    }
-};
-ScmInputContentProvider = ( (__decorate([
-    ( (__param(0, ITextModelService))),
-    ( (__param(1, IModelService))),
-    ( (__param(2, ILanguageService)))
-], ScmInputContentProvider)));
 
-export { ActionButtonRenderer, SCMAccessibilityProvider, SCMActionButton, SCMTreeKeyboardNavigationLabelProvider, SCMTreeSorter, SCMViewPane };
+export { ActionButtonRenderer, ContextKeys, SCMAccessibilityProvider, SCMActionButton, SCMTreeKeyboardNavigationLabelProvider, SCMTreeSorter, SCMViewPane };