@codingame/monaco-vscode-scm-service-override 23.2.2 → 24.1.0

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

@@ -5,12 +5,12 @@ import * as scm from './media/scm.css';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ViewAction, ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
 import { ViewMode, VIEW_PANE_ID, ISCMRepositorySortKey, ISCMRepositorySelectionMode, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
 import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -24,12 +24,12 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { ActionRunner, Action, toAction, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ResourceTree } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resourceTree';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from '@codingame/monaco-vscode-api/vscode/vs/base/common/comparers';
@@ -40,7 +40,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
@@ -64,7 +64,7 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { AnchorAlignment } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/contextview/contextview';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
 import { isDark } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/theme';
-import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common/vscode/vs/workbench/browser/parts/editor/editorCommands';
+import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { getFlatActionBarActions, createActionViewItem, getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { openLinkFromMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
@@ -79,7 +79,7 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from '@codingame/monaco-
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { fillEditorsDragData } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/dnd';
+import { fillEditorsDragData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/dnd';
 import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
 import { FormatOnType } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/formatActions';
 import { EditorOptions, EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
@@ -87,10 +87,10 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { WorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-2c64d2c2-fdf7-5675-a2fe-f6f65fbdedbf-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { OpenScmGroupAction } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 import { ContentHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/contentHoverController';
 import { GlyphHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -101,7 +101,7 @@ import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -159,7 +159,6 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         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(
@@ -257,7 +256,6 @@ let InputRenderer = class InputRenderer {
         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 inputElement = append(container, $('.scm-input'));
@@ -350,7 +348,6 @@ let ResourceGroupRenderer = class ResourceGroupRenderer {
         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'));
@@ -761,7 +758,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(10447, "Source Control Management");
+        return localize(10582, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -773,17 +770,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         else if (isSCMInput(element)) {
             const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
             if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
-                return localize(10448, "Source Control Input");
+                return localize(10583, "Source Control Input");
             }
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                10449,
+                10584,
                 "Source Control Input, Use {0} to open Source Control Accessibility Help.",
                 kbLabel
             ))
                 : ( localize(
-                10450,
+                10585,
                 "Source Control Input, Run the Open Accessibility Help command for more information."
             ));
         }
@@ -842,14 +839,14 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(10451, "View & Sort")),
+    title: ( localize(10586, "View & Sort")),
     submenu: Menus.ViewSort,
     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(10452, "Repositories")),
+    title: ( localize(10587, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -936,39 +933,63 @@ RepositoryVisibilityActionController = ( __decorate([
     ( __param(2, ISCMService))
 ], RepositoryVisibilityActionController));
 class SetListViewModeAction extends ViewAction {
-    constructor() {
+    constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
-            id: 'workbench.scm.action.setListViewMode',
-            title: ( localize(10453, "View as List")),
+            id,
+            title: ( localize(10588, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
             toggled: ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.List)),
-            menu: { id: Menus.ViewSort, group: '1_viewmode' }
+            menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
         view.viewMode = ViewMode.List;
     }
 }
-class SetTreeViewModeAction extends ViewAction {
+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(ViewMode.Tree)))),
+            group: 'navigation',
+            isHiddenByDefault: true,
+            order: -1e3
+        });
+    }
+}
+class SetTreeViewModeAction extends ViewAction {
+    constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
-            id: 'workbench.scm.action.setTreeViewMode',
-            title: ( localize(10454, "View as Tree")),
+            id,
+            title: ( localize(10589, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
             toggled: ( ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree)),
-            menu: { id: Menus.ViewSort, group: '1_viewmode' }
+            menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
         });
     }
     async runInView(_, view) {
         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(ViewMode.List)))),
+            group: 'navigation',
+            isHiddenByDefault: true,
+            order: -1e3
+        });
+    }
+}
 registerAction2(SetListViewModeAction);
 registerAction2(SetTreeViewModeAction);
+registerAction2(SetListViewModeNavigationAction);
+registerAction2(SetTreeViewModeNavigationAction);
 class RepositorySortAction extends Action2 {
     constructor(sortKey, title) {
         super({
@@ -995,17 +1016,17 @@ class RepositorySortAction extends Action2 {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10455, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(10590, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(10456, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(10591, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(10457, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(10592, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1041,12 +1062,12 @@ class RepositorySelectionModeAction extends Action2 {
 }
 class RepositorySingleSelectionModeAction extends RepositorySelectionModeAction {
     constructor() {
-        super(ISCMRepositorySelectionMode.Single, ( localize(10458, "Select Single Repository")), 1);
+        super(ISCMRepositorySelectionMode.Single, ( localize(10593, "Select Single Repository")), 1);
     }
 }
 class RepositoryMultiSelectionModeAction extends RepositorySelectionModeAction {
     constructor() {
-        super(ISCMRepositorySelectionMode.Multiple, ( localize(10459, "Select Multiple Repositories")), 2);
+        super(ISCMRepositorySelectionMode.Multiple, ( localize(10594, "Select Multiple Repositories")), 2);
     }
 }
 registerAction2(RepositorySingleSelectionModeAction);
@@ -1070,17 +1091,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(10460, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(10595, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(10461, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(10596, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(10462, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(10597, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1090,7 +1111,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(10463, "Collapse All Repositories")),
+            title: ( localize(10598, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1109,7 +1130,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(10464, "Expand All Repositories")),
+            title: ( localize(10599, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1139,7 +1160,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SCMInputWidgetCommandId.SetupAction,
-            title: ( localize(10465, "Generate Commit Message")),
+            title: ( localize(10600, "Generate Commit Message")),
             icon: Codicon.sparkle,
             f1: false,
             menu: {
@@ -1214,10 +1235,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( new MutableDisposable()));
-        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10466, "More Actions...")), 'codicon-chevron-down'));
+        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(10601, "More Actions...")), 'codicon-chevron-down'));
         this._cancelAction = ( new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(10467, "Cancel")),
+            title: ( localize(10602, "Cancel")),
             icon: Codicon.stopCircle,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService));
     }
@@ -1433,13 +1454,13 @@ let SCMInputWidget = class SCMInputWidget {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                10468,
+                10603,
                 "{0}, Use {1} to open Source Control Accessibility Help.",
                 placeholder,
                 kbLabel
             ))
                 : ( localize(
-                10469,
+                10604,
                 "{0}, Run the Open Accessibility Help command for more information.",
                 placeholder
             ));
@@ -1695,7 +1716,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( new ActionBar(actionsContainer));
-                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10470, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(10605, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -1922,12 +1943,15 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             compressionEnabled: compressionEnabled.get(),
             collapseByDefault: (e) => {
-                if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e)) {
-                    return false;
+                return !(isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e));
+            },
+            accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider),
+            twistieAdditionalCssClass: (e) => {
+                if (isSCMActionButton(e) || isSCMInput(e)) {
+                    return 'force-no-twistie';
                 }
-                return (viewState?.expanded ?? []).indexOf(getSCMResourceId(e)) === -1;
+                return undefined;
             },
-            accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider)
         });
         this.disposables.add(this.tree);
         this.tree.onDidOpen(this.open, this, this.disposables);

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts

@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(layoutService: IWorkbenchLayoutService, telemetryService: ITelemetryService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, themeService: IThemeService, storageService: IStorageService, configurationService: IConfigurationService, extensionService: IExtensionService, contextService: IWorkspaceContextService, viewDescriptorService: IViewDescriptorService, logService: ILogService);

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

@@ -13,7 +13,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 registerCss(scm);

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts

@@ -9,7 +9,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IObservable, ISettableObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
@@ -46,12 +46,12 @@ export declare class SCMViewService implements ISCMViewService {
     readonly selectionModeConfig: IObservable<ISCMRepositorySelectionMode>;
     readonly graphShowIncomingChangesConfig: IObservable<boolean>;
     readonly graphShowOutgoingChangesConfig: IObservable<boolean>;
-    private didFinishLoading;
     private didSelectRepository;
     private previousState;
     private readonly disposables;
     private _repositories;
     get repositories(): ISCMRepository[];
+    readonly didFinishLoadingRepositories: ISettableObservable<boolean, void>;
     get visibleRepositories(): ISCMRepository[];
     set visibleRepositories(visibleRepositories: ISCMRepository[]);
     private _onDidChangeRepositories;

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

@@ -25,12 +25,12 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import { getSCMRepositoryIcon } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getSCMRepositoryIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { latestChangedValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/experimental/utils';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableFromEventOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derivedObservableWithCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -55,7 +55,7 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(10471, "Auto")),
+            label: ( localize(10606, "Auto")),
             description: this._autoQuickItemDescription,
             repository: 'auto'
         };
@@ -134,10 +134,10 @@ let SCMViewService = class SCMViewService {
         this.configurationService = configurationService;
         this.storageService = storageService;
         this.workspaceContextService = workspaceContextService;
-        this.didFinishLoading = false;
         this.didSelectRepository = false;
         this.disposables = ( new DisposableStore());
         this._repositories = [];
+        this.didFinishLoadingRepositories = observableValue(this, false);
         this._onDidChangeRepositories = ( new Emitter());
         this.onDidChangeRepositories = this._onDidChangeRepositories.event;
         this._onDidSetVisibleRepositories = ( new Emitter());
@@ -148,18 +148,12 @@ let SCMViewService = class SCMViewService {
             const added = ( new Set(last.added));
             const removed = ( new Set(last.removed));
             for (const repository of e.added) {
-                if (( removed.has(repository))) {
-                    removed.delete(repository);
-                }
-                else {
+                if (!removed.delete(repository)) {
                     added.add(repository);
                 }
             }
             for (const repository of e.removed) {
-                if (( added.has(repository))) {
-                    added.delete(repository);
-                }
-                else {
+                if (!added.delete(repository)) {
                     removed.add(repository);
                 }
             }
@@ -243,18 +237,18 @@ let SCMViewService = class SCMViewService {
         storageService.onWillSaveState(this.onWillSaveState, this, this.disposables);
         extensionService.onWillStop(() => {
             this.onWillSaveState();
-            this.didFinishLoading = false;
+            this.didFinishLoadingRepositories.set(false, undefined);
         }, this, this.disposables);
     }
     onDidAddRepository(repository) {
-        if (!this.didFinishLoading) {
+        if (!this.didFinishLoadingRepositories.get()) {
             this.eventuallyFinishLoading();
         }
         const repositoryView = {
             repository, discoveryTime: Date.now(), focused: false, selectionIndex: -1
         };
         let removed = Iterable.empty();
-        if (this.previousState && !this.didFinishLoading) {
+        if (this.previousState && !this.didFinishLoadingRepositories.get()) {
             const index = this.previousState.all.indexOf(getProviderStorageKey(repository.provider));
             if (index === -1) {
                 const added = [];
@@ -303,7 +297,7 @@ let SCMViewService = class SCMViewService {
         }
     }
     onDidRemoveRepository(repository) {
-        if (!this.didFinishLoading) {
+        if (!this.didFinishLoadingRepositories.get()) {
             this.eventuallyFinishLoading();
         }
         const repositoriesIndex = this._repositories.findIndex(r => r.repository === repository);
@@ -413,7 +407,7 @@ let SCMViewService = class SCMViewService {
         repositories.splice(index < 0 ? ~index : index, 0, repositoryView);
     }
     onWillSaveState() {
-        if (!this.didFinishLoading) {
+        if (!this.didFinishLoadingRepositories.get()) {
             return;
         }
         const all = ( this.repositories.map(r => getProviderStorageKey(r.provider)));
@@ -425,10 +419,10 @@ let SCMViewService = class SCMViewService {
         this.finishLoading();
     }
     finishLoading() {
-        if (this.didFinishLoading) {
+        if (this.didFinishLoadingRepositories.get()) {
             return;
         }
-        this.didFinishLoading = true;
+        this.didFinishLoadingRepositories.set(true, undefined);
     }
     dispose() {
         this.disposables.dispose();

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

@@ -6,7 +6,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { getProviderKey } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getProviderKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';