@codingame/monaco-vscode-scm-service-override 19.1.3 → 20.0.0

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

@@ -34,8 +34,8 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
-import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, getHistoryItemHoverContent, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, getHistoryItemHoverContent, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { HISTORY_VIEW_PANE_ID, ViewMode } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
@@ -65,16 +65,17 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { getActionBarActions, getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { ResourceLabels } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ScmHistoryItemResolver } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { ResourceTree } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/base/common/resourceTree';
+import { ScmHistoryItemResolver } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { ResourceTree } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
 import { autorun, autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
@@ -98,7 +99,10 @@ class SCMRepositoryActionViewItem extends ActionViewItem {
         if (this.options.label && this.label) {
             this.label.classList.add('scm-graph-repository-picker');
             const icon = $('.icon');
-            icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.repo));
+            const iconClassNameArray = ThemeIcon.isThemeIcon(this._repository.provider.iconPath)
+                ? ThemeIcon.asClassNameArray(this._repository.provider.iconPath)
+                : ThemeIcon.asClassNameArray(Codicon.repo);
+            icon.classList.add(...iconClassNameArray);
             const name = $('.name');
             name.textContent = this._repository.provider.name;
             reset(this.label, icon, name);
@@ -121,23 +125,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
             icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
             const name = $('.name');
             if (this._historyItemsFilter === 'all') {
-                name.textContent = ( localize(9709, "All"));
+                name.textContent = ( localize(9865, "All"));
             }
             else if (this._historyItemsFilter === 'auto') {
-                name.textContent = ( localize(9710, "Auto"));
+                name.textContent = ( localize(9866, "Auto"));
             }
             else if (this._historyItemsFilter.length === 1) {
                 name.textContent = this._historyItemsFilter[0].name;
             }
             else {
-                name.textContent = ( localize(9711, "{0} Items", this._historyItemsFilter.length));
+                name.textContent = ( localize(9867, "{0} Items", this._historyItemsFilter.length));
             }
             reset(this.label, icon, name);
         }
     }
     getTooltip() {
         if (this._historyItemsFilter === 'all') {
-            return localize(9712, "All history item references");
+            return localize(9868, "All history item references");
         }
         else if (this._historyItemsFilter === 'auto') {
             const historyProvider = this._repository.provider.historyProvider.get();
@@ -159,7 +163,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_REPOSITORY_ACTION_ID,
-            title: ( localize(9713, "Repository Picker")),
+            title: ( localize(9869, "Repository Picker")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             menu: {
@@ -178,7 +182,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
-            title: ( localize(9714, "History Item Reference Picker")),
+            title: ( localize(9870, "History Item Reference Picker")),
             icon: Codicon.gitBranch,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
@@ -198,7 +202,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
-            title: ( localize(9715, "Go to Current History Item")),
+            title: ( localize(9871, "Go to Current History Item")),
             icon: Codicon.target,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
@@ -218,7 +222,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.refresh',
-            title: ( localize(9716, "Refresh")),
+            title: ( localize(9872, "Refresh")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             icon: Codicon.refresh,
@@ -237,7 +241,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setListViewMode',
-            title: ( localize(9717, "View as List")),
+            title: ( localize(9873, "View as List")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
@@ -252,7 +256,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setTreeViewMode',
-            title: ( localize(9718, "View as Tree")),
+            title: ( localize(9874, "View as Tree")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
@@ -267,7 +271,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.viewChanges',
-            title: ( localize(9719, "Open Changes")),
+            title: ( localize(9875, "Open Changes")),
             icon: Codicon.diffMultiple,
             f1: false,
             menu: [
@@ -303,7 +307,7 @@ registerAction2(class extends Action2 {
         const title = historyItems.length === 1 ?
             getHistoryItemEditorTitle(historyItem) :
             ( localize(
-            9720,
+            9876,
             "All Changes ({0} ↔ {1})",
             historyItemLast.displayId ?? historyItemLast.id,
             historyItem.displayId ?? historyItem.id
@@ -316,7 +320,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.openFile',
-            title: ( localize(9721, "Open File")),
+            title: ( localize(9877, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: [
@@ -510,6 +514,7 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         templateData.elementDisposables.clear();
     }
     disposeTemplate(templateData) {
+        templateData.elementDisposables.dispose();
         templateData.disposables.dispose();
     }
 };
@@ -649,7 +654,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
             templateData.elementDisposables.add(autorun(reader => {
                 const isLoadingMore = this._isLoadingMore.read(reader);
                 const icon = `$(${isLoadingMore ? 'loading~spin' : 'fold-down'})`;
-                templateData.historyItemPlaceholderLabel.setLabel(( localize(9722, "{0} Load More...", icon)));
+                templateData.historyItemPlaceholderLabel.setLabel(( localize(9878, "{0} Load More...", icon)));
             }));
         }
     }
@@ -660,6 +665,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
         templateData.elementDisposables.clear();
     }
     disposeTemplate(templateData) {
+        templateData.elementDisposables.dispose();
         templateData.disposables.dispose();
     }
 };
@@ -708,7 +714,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
 ], SCMHistoryViewPaneActionRunner));
 class SCMHistoryTreeAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(9723, "Source Control History");
+        return localize(9879, "Source Control History");
     }
     getAriaLabel(element) {
         if (isSCMRepository(element)) {
@@ -845,6 +851,66 @@ class SCMHistoryTreeDataSource extends Disposable {
             (isSCMHistoryItemChangeNode(inputOrElement) && inputOrElement.childrenCount > 0);
     }
 }
+class SCMHistoryTreeDragAndDrop {
+    getDragURI(element) {
+        const uri = this._getTreeElementUri(element);
+        return uri ? ( uri.toString()) : null;
+    }
+    onDragStart(data, originalEvent) {
+        if (!originalEvent.dataTransfer) {
+            return;
+        }
+        const historyItems = this._getDragAndDropData(data);
+        if (historyItems.length === 0) {
+            return;
+        }
+        originalEvent.dataTransfer.setData(CodeDataTransfers.SCM_HISTORY_ITEM, JSON.stringify(historyItems));
+    }
+    getDragLabel(elements, originalEvent) {
+        if (elements.length === 1) {
+            const element = elements[0];
+            return this._getTreeElementLabel(element);
+        }
+        return String(elements.length);
+    }
+    onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
+        return false;
+    }
+    drop(data, targetElement, targetIndex, targetSector, originalEvent) { }
+    _getDragAndDropData(data) {
+        const historyItems = [];
+        for (const element of [...(data.context ?? []), ...data.elements]) {
+            if (!isSCMHistoryItemViewModelTreeElement(element)) {
+                continue;
+            }
+            const provider = element.repository.provider;
+            const historyItem = element.historyItemViewModel.historyItem;
+            const attachmentName = `$(${Codicon.repo.id})\u00A0${provider.name}\u00A0$(${Codicon.gitCommit.id})\u00A0${historyItem.displayId ?? historyItem.id}`;
+            historyItems.push({
+                name: attachmentName,
+                resource: ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem),
+                historyItem: historyItem
+            });
+        }
+        return historyItems;
+    }
+    _getTreeElementLabel(element) {
+        if (isSCMHistoryItemViewModelTreeElement(element)) {
+            const historyItem = element.historyItemViewModel.historyItem;
+            return getHistoryItemEditorTitle(historyItem);
+        }
+        return undefined;
+    }
+    _getTreeElementUri(element) {
+        if (isSCMHistoryItemViewModelTreeElement(element)) {
+            const provider = element.repository.provider;
+            const historyItem = element.historyItemViewModel.historyItem;
+            return ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItem);
+        }
+        return undefined;
+    }
+    dispose() { }
+}
 let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
     constructor(_configurationService, _contextKeyService, _extensionService, _scmService, _scmViewService, _storageService) {
         super();
@@ -1091,8 +1157,8 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(9710, "Auto")),
-            description: ( localize(9724, "Show the source control graph for the active repository")),
+            label: ( localize(9866, "Auto")),
+            description: ( localize(9880, "Show the source control graph for the active repository")),
             repository: 'auto'
         };
     }
@@ -1104,11 +1170,13 @@ let RepositoryPicker = class RepositoryPicker {
         picks.push(...( this._scmViewService.repositories.map(r => ({
             label: r.provider.name,
             description: r.provider.rootUri?.fsPath,
-            iconClass: ThemeIcon.asClassName(Codicon.repo),
+            iconClass: ThemeIcon.isThemeIcon(r.provider.iconPath)
+                ? ThemeIcon.asClassName(r.provider.iconPath)
+                : ThemeIcon.asClassName(Codicon.repo),
             repository: r
         }))));
         return this._quickInputService.pick(picks, {
-            placeHolder: ( localize(9725, "Select the repository to view, type to filter all repositories"))
+            placeHolder: ( localize(9881, "Select the repository to view, type to filter all repositories"))
         });
     }
 };
@@ -1124,21 +1192,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
         this._quickInputService = _quickInputService;
         this._allQuickPickItem = {
             id: 'all',
-            label: ( localize(9709, "All")),
-            description: ( localize(9712, "All history item references")),
+            label: ( localize(9865, "All")),
+            description: ( localize(9868, "All history item references")),
             historyItemRef: 'all'
         };
         this._autoQuickPickItem = {
             id: 'auto',
-            label: ( localize(9710, "Auto")),
-            description: ( localize(9726, "Current history item reference(s)")),
+            label: ( localize(9866, "Auto")),
+            description: ( localize(9882, "Current history item reference(s)")),
             historyItemRef: 'auto'
         };
     }
     async pickHistoryItemRef() {
         const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
         this._store.add(quickPick);
-        quickPick.placeholder = ( localize(9727, "Select one/more history item references to view, type to filter"));
+        quickPick.placeholder = ( localize(9883, "Select one/more history item references to view, type to filter"));
         quickPick.canSelectMany = true;
         quickPick.hideCheckAll = true;
         quickPick.busy = true;
@@ -1268,7 +1336,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         container.appendChild(element.root);
         this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
             markdown: {
-                value: ( localize(9728, "Please refresh the graph using the refresh action ($(refresh)).")),
+                value: ( localize(9884, "Please refresh the graph using the refresh action ($(refresh)).")),
                 supportThemeIcons: true
             },
             markdownNotSupportedFallback: undefined
@@ -1342,7 +1410,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                 store.add(runOnChange(this._treeViewModel.viewMode, async () => {
                     await this._updateChildren();
                 }));
-                this._scmProviderCtx.set(repository.provider.contextValue);
+                this._scmProviderCtx.set(repository.provider.providerId);
                 this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.get()));
                 if (!isFirstRun) {
                     this.refresh();
@@ -1466,6 +1534,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
             identityProvider: this._treeIdentityProvider,
             collapseByDefault: (e) => !isSCMHistoryItemChangeNode(e),
             compressionEnabled: compressionEnabled.get(),
+            dnd: ( new SCMHistoryTreeDragAndDrop()),
             keyboardNavigationLabelProvider: ( new SCMHistoryTreeKeyboardNavigationLabelProvider()),
             horizontalScrolling: false,
             multipleSelectionSupport: false

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

@@ -1,5 +1,6 @@
 import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
+import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
@@ -10,16 +11,16 @@ import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 export declare class SCMRepositoriesViewPane extends ViewPane {
-    protected scmViewService: ISCMViewService;
+    private readonly scmService;
+    private readonly scmViewService;
     private tree;
-    private treeViewModel;
     private treeDataSource;
     private treeIdentityProvider;
     private readonly treeOperationSequencer;
     private readonly visibleCountObs;
     private readonly providerCountBadgeObs;
     private readonly visibilityDisposables;
-    constructor(options: IViewPaneOptions, scmViewService: ISCMViewService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService);
+    constructor(options: IViewPaneOptions, scmService: ISCMService, scmViewService: ISCMViewService, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService);
     protected renderBody(container: HTMLElement): void;
     protected layoutBody(height: number, width: number): void;
     focus(): void;
@@ -27,7 +28,12 @@ export declare class SCMRepositoriesViewPane extends ViewPane {
     private onTreeContextMenu;
     private onTreeSelectionChange;
     private onTreeDidChangeFocus;
+    private onDidTreeFocus;
+    private onTreeContentHeightChange;
     private updateChildren;
+    private expand;
+    private updateRepository;
+    private updateParentRepository;
     private updateBodySize;
     private updateTreeSelection;
     dispose(): void;

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

@@ -6,7 +6,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
-import { ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
+import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -17,7 +17,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
-import { getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -26,6 +26,7 @@ import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { Sequencer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
 
 registerCss(scm);
@@ -37,39 +38,40 @@ class ListDelegate {
         return RepositoryRenderer.TEMPLATE_ID;
     }
 }
-class RepositoryTreeDataSource extends Disposable {
-    async getChildren(inputOrElement) {
-        if (inputOrElement instanceof SCMRepositoriesViewModel) {
-            return inputOrElement.repositories;
-        }
-        return [];
+let RepositoryTreeDataSource = class RepositoryTreeDataSource extends Disposable {
+    constructor(scmViewService) {
+        super();
+        this.scmViewService = scmViewService;
+    }
+    getChildren(inputOrElement) {
+        const parentId = isSCMRepository(inputOrElement)
+            ? inputOrElement.provider.id
+            : undefined;
+        const repositories = this.scmViewService.repositories
+            .filter(r => r.provider.parentId === parentId);
+        return repositories;
     }
     hasChildren(inputOrElement) {
-        return inputOrElement instanceof SCMRepositoriesViewModel;
+        const parentId = isSCMRepository(inputOrElement)
+            ? inputOrElement.provider.id
+            : undefined;
+        const repositories = this.scmViewService.repositories
+            .filter(r => r.provider.parentId === parentId);
+        return repositories.length > 0;
     }
-}
+};
+RepositoryTreeDataSource = ( __decorate([
+    ( __param(0, ISCMViewService))
+], RepositoryTreeDataSource));
 class RepositoryTreeIdentityProvider {
     getId(element) {
         return element.provider.id;
     }
 }
-let SCMRepositoriesViewModel = class SCMRepositoriesViewModel extends Disposable {
-    constructor(scmViewService) {
-        super();
-        this.scmViewService = scmViewService;
-        this.onDidChangeRepositoriesSignal = observableSignalFromEvent(this, this.scmViewService.onDidChangeRepositories);
-        this.onDidChangeVisibleRepositoriesSignal = observableSignalFromEvent(this, this.scmViewService.onDidChangeVisibleRepositories);
-    }
-    get repositories() {
-        return this.scmViewService.repositories;
-    }
-};
-SCMRepositoriesViewModel = ( __decorate([
-    ( __param(0, ISCMViewService))
-], SCMRepositoriesViewModel));
 let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
-    constructor(options, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, hoverService) {
+    constructor(options, scmService, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, hoverService) {
         super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+        this.scmService = scmService;
         this.scmViewService = scmViewService;
         this.treeOperationSequencer = ( new Sequencer());
         this.visibilityDisposables = ( new DisposableStore());
@@ -90,21 +92,32 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                 this.visibilityDisposables.clear();
                 return;
             }
-            this.treeViewModel = this.instantiationService.createInstance(SCMRepositoriesViewModel);
-            this._register(this.treeViewModel);
             this.treeOperationSequencer.queue(async () => {
-                await this.tree.setInput(this.treeViewModel);
+                await this.tree.setInput(this.scmViewService);
                 this.visibilityDisposables.add(autorun(reader => {
                     const visibleCount = this.visibleCountObs.read(reader);
-                    this.updateBodySize(visibleCount);
+                    this.updateBodySize(this.tree.contentHeight, visibleCount);
                 }));
+                const addedRepositoryObs = observableFromEvent(this, this.scmService.onDidAddRepository, e => e);
+                const removedRepositoryObs = observableFromEvent(this, this.scmService.onDidRemoveRepository, e => e);
                 this.visibilityDisposables.add(autorun(async (reader) => {
-                    this.treeViewModel.onDidChangeRepositoriesSignal.read(reader);
-                    await this.treeOperationSequencer.queue(() => this.updateChildren());
+                    const addedRepository = addedRepositoryObs.read(reader);
+                    const removedRepository = removedRepositoryObs.read(reader);
+                    if (addedRepository === undefined && removedRepository === undefined) {
+                        await this.updateChildren();
+                        return;
+                    }
+                    if (addedRepository) {
+                        await this.updateRepository(addedRepository);
+                    }
+                    if (removedRepository) {
+                        await this.updateRepository(removedRepository);
+                    }
                 }));
+                const onDidChangeVisibleRepositoriesSignal = observableSignalFromEvent(this, this.scmViewService.onDidChangeVisibleRepositories);
                 this.visibilityDisposables.add(autorun(async (reader) => {
-                    this.treeViewModel.onDidChangeVisibleRepositoriesSignal.read(reader);
-                    await this.treeOperationSequencer.queue(async () => this.updateTreeSelection());
+                    onDidChangeVisibleRepositoriesSignal.read(reader);
+                    await this.treeOperationSequencer.queue(() => this.updateTreeSelection());
                 }));
             });
         }, this, this._store);
@@ -129,21 +142,31 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         ], this.treeDataSource, {
             identityProvider: this.treeIdentityProvider,
             horizontalScrolling: false,
+            collapseByDefault: (e) => {
+                if (isSCMRepository(e) && e.provider.parentId === undefined) {
+                    return false;
+                }
+                return true;
+            },
             compressionEnabled: compressionEnabled.get(),
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+            expandOnDoubleClick: false,
+            expandOnlyOnTwistieClick: true,
             accessibilityProvider: {
                 getAriaLabel(r) {
                     return r.provider.label;
                 },
                 getWidgetAriaLabel() {
-                    return localize(9729, "Source Control Repositories");
+                    return localize(9885, "Source Control Repositories");
                 }
             }
         });
         this._register(this.tree);
         this._register(this.tree.onDidChangeSelection(this.onTreeSelectionChange, this));
         this._register(this.tree.onDidChangeFocus(this.onTreeDidChangeFocus, this));
+        this._register(this.tree.onDidFocus(this.onDidTreeFocus, this));
         this._register(this.tree.onContextMenu(this.onTreeContextMenu, this));
+        this._register(this.tree.onDidChangeContentHeight(this.onTreeContentHeightChange, this));
     }
     onTreeContextMenu(e) {
         if (!e.element) {
@@ -151,7 +174,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         }
         const provider = e.element.provider;
         const menus = this.scmViewService.menus.getRepositoryMenus(provider);
-        const menu = menus.repositoryContextMenu;
+        const menu = menus.getRepositoryContextMenu(e.element);
         const actions = collectContextMenuActions(menu);
         const disposables = ( new DisposableStore());
         const actionRunner = ( new RepositoryActionRunner(() => {
@@ -179,20 +202,56 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
             this.scmViewService.focus(e.elements[0]);
         }
     }
-    async updateChildren() {
-        await this.tree.updateChildren(this.treeViewModel);
-        this.updateBodySize(this.visibleCountObs.get());
+    onDidTreeFocus() {
+        const focused = this.tree.getFocus();
+        if (focused.length > 0) {
+            this.scmViewService.focus(focused[0]);
+        }
+    }
+    onTreeContentHeightChange(height) {
+        this.updateBodySize(height);
+        this.treeOperationSequencer.queue(() => this.updateTreeSelection());
+    }
+    async updateChildren(element) {
+        await this.treeOperationSequencer.queue(async () => {
+            if (element && this.tree.hasNode(element)) {
+                await this.tree.updateChildren(element, true);
+            }
+            else {
+                await this.tree.updateChildren(undefined, true);
+            }
+        });
+    }
+    async expand(element) {
+        await this.treeOperationSequencer.queue(() => this.tree.expand(element, true));
+    }
+    async updateRepository(repository) {
+        if (repository.provider.parentId === undefined) {
+            await this.updateChildren();
+            return;
+        }
+        await this.updateParentRepository(repository);
+    }
+    async updateParentRepository(repository) {
+        const parentRepository = this.scmViewService.repositories
+            .find(r => r.provider.id === repository.provider.parentId);
+        if (!parentRepository) {
+            return;
+        }
+        await this.updateChildren(parentRepository);
+        await this.expand(parentRepository);
     }
-    updateBodySize(visibleCount) {
+    updateBodySize(contentHeight, visibleCount) {
         if (this.orientation === Orientation.HORIZONTAL) {
             return;
         }
+        visibleCount = visibleCount ?? this.visibleCountObs.get();
         const empty = this.scmViewService.repositories.length === 0;
-        const size = Math.min(this.scmViewService.repositories.length, visibleCount) * 22;
+        const size = Math.min(contentHeight / 22, visibleCount) * 22;
         this.minimumBodySize = visibleCount === 0 ? 22 : size;
         this.maximumBodySize = visibleCount === 0 ? Number.POSITIVE_INFINITY : empty ? Number.POSITIVE_INFINITY : size;
     }
-    updateTreeSelection() {
+    async updateTreeSelection() {
         const oldSelection = this.tree.getSelection();
         const oldSet = ( new Set(oldSelection));
         const set = ( new Set(this.scmViewService.visibleRepositories));
@@ -207,10 +266,12 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                 selection.push(repo);
             }
         }
-        this.tree.setSelection(selection);
-        if (selection.length > 0 && !this.tree.getFocus().includes(selection[0])) {
-            this.tree.setAnchor(selection[0]);
-            this.tree.setFocus([selection[0]]);
+        const visibleSelection = selection
+            .filter(s => this.tree.hasNode(s));
+        this.tree.setSelection(visibleSelection);
+        if (visibleSelection.length > 0 && !this.tree.getFocus().includes(visibleSelection[0])) {
+            this.tree.setAnchor(visibleSelection[0]);
+            this.tree.setFocus([visibleSelection[0]]);
         }
     }
     dispose() {
@@ -219,16 +280,17 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
     }
 };
 SCMRepositoriesViewPane = ( __decorate([
-    ( __param(1, ISCMViewService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IContextMenuService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IViewDescriptorService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IOpenerService)),
-    ( __param(9, IThemeService)),
-    ( __param(10, IHoverService))
+    ( __param(1, ISCMService)),
+    ( __param(2, ISCMViewService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IContextMenuService)),
+    ( __param(5, IInstantiationService)),
+    ( __param(6, IViewDescriptorService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, IConfigurationService)),
+    ( __param(9, IOpenerService)),
+    ( __param(10, IThemeService)),
+    ( __param(11, IHoverService))
 ], SCMRepositoriesViewPane));
 
 export { SCMRepositoriesViewPane };