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

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

@@ -3,7 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as scm from './media/scm.css';
 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 { ViewPane } from '@codingame/monaco-vscode-api/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, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.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 { isSCMRepository, isSCMArtifactGroupTreeElement, isSCMArtifactTreeElement, isSCMArtifactNode, connectPrimaryMenu, getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, isSCMArtifactGroupTreeElement, isSCMArtifactTreeElement, isSCMArtifactNode, connectPrimaryMenu, getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-api/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';
@@ -32,10 +32,13 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-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 { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+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 { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
@@ -65,7 +68,8 @@ let ArtifactGroupRenderer = class ArtifactGroupRenderer {
     static { ArtifactGroupRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'artifactGroup'; }
     get templateId() { return ArtifactGroupRenderer_1.TEMPLATE_ID; }
-    constructor(_contextMenuService, _contextKeyService, _keybindingService, _menuService, _commandService, _scmViewService, _telemetryService) {
+    constructor(actionViewItemProvider, _contextMenuService, _contextKeyService, _keybindingService, _menuService, _commandService, _scmViewService, _telemetryService) {
+        this.actionViewItemProvider = actionViewItemProvider;
         this._contextMenuService = _contextMenuService;
         this._contextKeyService = _contextKeyService;
         this._keybindingService = _keybindingService;
@@ -81,7 +85,7 @@ let ArtifactGroupRenderer = class ArtifactGroupRenderer {
         const actionsContainer = append(element, $('.actions'));
         const actionBar = ( new WorkbenchToolBar(
             actionsContainer,
-            undefined,
+            { actionViewItemProvider: this.actionViewItemProvider },
             this._menuService,
             this._contextKeyService,
             this._contextMenuService,
@@ -116,19 +120,20 @@ let ArtifactGroupRenderer = class ArtifactGroupRenderer {
     }
 };
 ArtifactGroupRenderer = ArtifactGroupRenderer_1 = ( __decorate([
-    ( __param(0, IContextMenuService)),
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IMenuService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, ISCMViewService)),
-    ( __param(6, ITelemetryService))
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IMenuService)),
+    ( __param(5, ICommandService)),
+    ( __param(6, ISCMViewService)),
+    ( __param(7, ITelemetryService))
 ], ArtifactGroupRenderer));
 let ArtifactRenderer = class ArtifactRenderer {
     static { ArtifactRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'artifact'; }
     get templateId() { return ArtifactRenderer_1.TEMPLATE_ID; }
-    constructor(_contextMenuService, _contextKeyService, _keybindingService, _menuService, _commandService, _scmViewService, _telemetryService) {
+    constructor(actionViewItemProvider, _contextMenuService, _contextKeyService, _keybindingService, _menuService, _commandService, _scmViewService, _telemetryService) {
+        this.actionViewItemProvider = actionViewItemProvider;
         this._contextMenuService = _contextMenuService;
         this._contextKeyService = _contextKeyService;
         this._keybindingService = _keybindingService;
@@ -141,10 +146,12 @@ let ArtifactRenderer = class ArtifactRenderer {
         const element = append(container, $('.scm-artifact'));
         const icon = append(element, $('.icon'));
         const label = ( new IconLabel(element, { supportIcons: false }));
+        const timestampContainer = append(element, $('.timestamp-container'));
+        const timestamp = append(timestampContainer, $('.timestamp'));
         const actionsContainer = append(element, $('.actions'));
         const actionBar = ( new WorkbenchToolBar(
             actionsContainer,
-            undefined,
+            { actionViewItemProvider: this.actionViewItemProvider },
             this._menuService,
             this._contextKeyService,
             this._contextMenuService,
@@ -152,22 +159,31 @@ let ArtifactRenderer = class ArtifactRenderer {
             this._commandService,
             this._telemetryService
         ));
-        return { icon, label, actionBar, elementDisposables: ( new DisposableStore()), templateDisposable: combinedDisposable(label, actionBar) };
+        return { icon, label, timestampContainer, timestamp, actionBar, elementDisposables: ( new DisposableStore()), templateDisposable: combinedDisposable(label, actionBar) };
     }
     renderElement(nodeOrElement, index, templateData) {
         const artifactOrFolder = nodeOrElement.element;
         if (isSCMArtifactTreeElement(artifactOrFolder)) {
+            const artifactGroup = artifactOrFolder.group;
             const artifact = artifactOrFolder.artifact;
             const artifactIcon = artifact.icon ?? artifactOrFolder.group.icon;
             templateData.icon.className = ThemeIcon.isThemeIcon(artifactIcon)
                 ? `icon ${ThemeIcon.asClassName(artifactIcon)}`
                 : '';
-            const artifactLabel = artifact.name.split('/').pop() ?? artifact.name;
+            const artifactLabel = artifactGroup.supportsFolders
+                ? artifact.name.split('/').pop() ?? artifact.name
+                : artifact.name;
             templateData.label.setLabel(artifactLabel, artifact.description);
+            templateData.timestamp.textContent = artifact.timestamp ? fromNow(artifact.timestamp) : '';
+            templateData.timestampContainer.classList.toggle('duplicate', artifactOrFolder.hideTimestamp);
+            templateData.timestampContainer.style.display = '';
         }
         else if (isSCMArtifactNode(artifactOrFolder)) {
             templateData.icon.className = `icon ${ThemeIcon.asClassName(Codicon.folder)}`;
             templateData.label.setLabel(basename(artifactOrFolder.uri));
+            templateData.timestamp.textContent = '';
+            templateData.timestampContainer.classList.remove('duplicate');
+            templateData.timestampContainer.style.display = 'none';
         }
         this._renderActionBar(artifactOrFolder, templateData);
     }
@@ -181,10 +197,16 @@ let ArtifactRenderer = class ArtifactRenderer {
                 ? `icon ${ThemeIcon.asClassName(artifactIcon)}`
                 : '';
             templateData.label.setLabel(artifact.name, artifact.description);
+            templateData.timestamp.textContent = artifact.timestamp ? fromNow(artifact.timestamp) : '';
+            templateData.timestampContainer.classList.toggle('duplicate', artifactOrFolder.hideTimestamp);
+            templateData.timestampContainer.style.display = '';
         }
         else if (isSCMArtifactNode(artifactOrFolder)) {
             templateData.icon.className = `icon ${ThemeIcon.asClassName(Codicon.folder)}`;
             templateData.label.setLabel(artifactOrFolder.uri.fsPath.substring(1));
+            templateData.timestamp.textContent = '';
+            templateData.timestampContainer.classList.remove('duplicate');
+            templateData.timestampContainer.style.display = 'none';
         }
         this._renderActionBar(artifactOrFolder, templateData);
     }
@@ -212,13 +234,13 @@ let ArtifactRenderer = class ArtifactRenderer {
     }
 };
 ArtifactRenderer = ArtifactRenderer_1 = ( __decorate([
-    ( __param(0, IContextMenuService)),
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IMenuService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, ISCMViewService)),
-    ( __param(6, ITelemetryService))
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, IMenuService)),
+    ( __param(5, ICommandService)),
+    ( __param(6, ISCMViewService)),
+    ( __param(7, ITelemetryService))
 ], ArtifactRenderer));
 let RepositoryTreeDataSource = class RepositoryTreeDataSource extends Disposable {
     constructor(scmViewService) {
@@ -261,18 +283,43 @@ let RepositoryTreeDataSource = class RepositoryTreeDataSource extends Disposable
         else if (isSCMArtifactGroupTreeElement(inputOrElement)) {
             const repository = inputOrElement.repository;
             const artifacts = (await repository.provider.artifactProvider.get()?.provideArtifacts(inputOrElement.artifactGroup.id)) ?? [];
-            const artifactsTree = ( new ResourceTree(inputOrElement));
-            for (const artifact of artifacts) {
-                artifactsTree.add(( URI.from({
-                    scheme: 'scm-artifact', path: artifact.name
-                })), {
-                    repository,
-                    group: inputOrElement.artifactGroup,
-                    artifact,
-                    type: 'artifact'
-                });
+            if (inputOrElement.artifactGroup.supportsFolders) {
+                const artifactsTree = ( new ResourceTree(inputOrElement));
+                for (let index = 0; index < artifacts.length; index++) {
+                    const artifact = artifacts[index];
+                    const artifactUri = ( URI.from({ scheme: 'scm-artifact', path: artifact.name }));
+                    const artifactDirectory = artifact.id.lastIndexOf('/') > 0
+                        ? artifact.id.substring(0, artifact.id.lastIndexOf('/'))
+                        : artifact.id;
+                    const prevArtifact = index > 0 ? artifacts[index - 1] : undefined;
+                    const prevArtifactDirectory = prevArtifact && prevArtifact.id.lastIndexOf('/') > 0
+                        ? prevArtifact.id.substring(0, prevArtifact.id.lastIndexOf('/'))
+                        : prevArtifact?.id;
+                    const hideTimestamp = index > 0 &&
+                        artifact.timestamp !== undefined &&
+                        prevArtifact?.timestamp !== undefined &&
+                        artifactDirectory === prevArtifactDirectory &&
+                        fromNow(prevArtifact.timestamp) === fromNow(artifact.timestamp);
+                    artifactsTree.add(artifactUri, {
+                        repository,
+                        group: inputOrElement.artifactGroup,
+                        artifact,
+                        hideTimestamp,
+                        type: 'artifact'
+                    });
+                }
+                return ( Iterable.map(artifactsTree.root.children, node => node.element ?? node));
             }
-            return ( Iterable.map(artifactsTree.root.children, node => node.element ?? node));
+            return ( artifacts.map((artifact, index, artifacts) => ({
+                repository,
+                group: inputOrElement.artifactGroup,
+                artifact,
+                hideTimestamp: index > 0 &&
+                    artifact.timestamp !== undefined &&
+                    artifacts[index - 1].timestamp !== undefined &&
+                    fromNow(artifacts[index - 1].timestamp) === fromNow(artifact.timestamp),
+                type: 'artifact'
+            })));
         }
         else if (isSCMArtifactNode(inputOrElement)) {
             return ( Iterable.map(
@@ -280,7 +327,6 @@ let RepositoryTreeDataSource = class RepositoryTreeDataSource extends Disposable
                 node => node.element && node.childrenCount === 0 ? node.element : node
             ));
         }
-        else ;
         return [];
     }
     hasChildren(inputOrElement) {
@@ -345,16 +391,21 @@ class RepositoriesTreeCompressionDelegate {
     }
 }
 let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
-    constructor(options, scmService, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, hoverService) {
+    constructor(options, scmService, scmViewService, keybindingService, contextMenuService, commandService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, hoverService, storageService) {
         super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.scmService = scmService;
         this.scmViewService = scmViewService;
+        this.commandService = commandService;
+        this.storageService = storageService;
         this.treeOperationSequencer = ( new Sequencer());
         this.updateChildrenThrottler = ( new Throttler());
         this.visibilityDisposables = ( new DisposableStore());
         this.repositoryDisposables = ( new DisposableMap());
         this.visibleCountObs = observableConfigValue('scm.repositories.visible', 10, this.configurationService);
         this.providerCountBadgeObs = observableConfigValue('scm.providerCountBadge', 'hidden', this.configurationService);
+        this.storageService.onWillSaveState(() => {
+            this.storeTreeViewState();
+        }, this, this._store);
         this._register(this.updateChildrenThrottler);
     }
     renderBody(container) {
@@ -365,14 +416,15 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
             treeContainer.classList.toggle('hide-provider-counts', providerCountBadge === 'hidden');
             treeContainer.classList.toggle('auto-provider-counts', providerCountBadge === 'auto');
         }));
-        this.createTree(treeContainer);
+        const viewState = this.loadTreeViewState();
+        this.createTree(treeContainer, viewState);
         this.onDidChangeBodyVisibility(async (visible) => {
             if (!visible) {
                 this.visibilityDisposables.clear();
                 return;
             }
             this.treeOperationSequencer.queue(async () => {
-                await this.tree.setInput(this.scmViewService);
+                await this.tree.setInput(this.scmViewService, viewState);
                 this.visibilityDisposables.add(autorun(reader => {
                     const visibleCount = this.visibleCountObs.read(reader);
                     this.updateBodySize(this.tree.contentHeight, visibleCount);
@@ -394,6 +446,13 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                 for (const repository of this.scmService.repositories) {
                     this.onDidAddRepository(repository);
                 }
+                this.visibilityDisposables.add(autorun(async (reader) => {
+                    const explorerEnabledConfig = this.scmViewService.explorerEnabledConfig.read(reader);
+                    const didFinishLoadingRepositories = this.scmViewService.didFinishLoadingRepositories.read(reader);
+                    if (viewState === undefined && explorerEnabledConfig && didFinishLoadingRepositories && this.scmViewService.repositories.length === 1) {
+                        await this.treeOperationSequencer.queue(() => this.tree.expand(this.scmViewService.repositories[0]));
+                    }
+                }));
             });
         }, this, this._store);
     }
@@ -405,14 +464,14 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         super.focus();
         this.tree.domFocus();
     }
-    createTree(container) {
+    createTree(container, viewState) {
         this.treeIdentityProvider = ( new RepositoryTreeIdentityProvider());
         this.treeDataSource = this.instantiationService.createInstance(RepositoryTreeDataSource);
         this._register(this.treeDataSource);
         this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM Repositories', container, ( new ListDelegate()), ( new RepositoriesTreeCompressionDelegate()), [
             this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMSourceControlInline, getActionViewItemProvider(this.instantiationService)),
-            this.instantiationService.createInstance(ArtifactGroupRenderer),
-            this.instantiationService.createInstance(ArtifactRenderer)
+            this.instantiationService.createInstance(ArtifactGroupRenderer, getActionViewItemProvider(this.instantiationService)),
+            this.instantiationService.createInstance(ArtifactRenderer, getActionViewItemProvider(this.instantiationService))
         ], this.treeDataSource, {
             identityProvider: this.treeIdentityProvider,
             horizontalScrolling: false,
@@ -423,7 +482,10 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                     }
                     return true;
                 }
-                if (isSCMArtifactNode(e)) {
+                if (viewState?.expanded && (isSCMRepository(e) || isSCMArtifactGroupTreeElement(e) || isSCMArtifactTreeElement(e))) {
+                    return viewState.expanded.indexOf(this.treeIdentityProvider.getId(e)) === -1;
+                }
+                else if (isSCMArtifactNode(e)) {
                     return !(e.childrenCount === 1 && Iterable.first(e.children)?.element === undefined);
                 }
                 else {
@@ -451,7 +513,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                     }
                 },
                 getWidgetAriaLabel() {
-                    return localize(10446, "Source Control Repositories");
+                    return localize(10581, "Source Control Repositories");
                 }
             }
         });
@@ -460,6 +522,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
             const selectionMode = this.scmViewService.selectionModeConfig.read(reader);
             this.tree.updateOptions({ multipleSelectionSupport: selectionMode === 'multiple' });
         }));
+        this._register(this.tree.onDidOpen(this.onTreeDidOpen, this));
         this._register(this.tree.onDidChangeSelection(this.onTreeSelectionChange, this));
         this._register(this.tree.onDidChangeFocus(this.onTreeDidChangeFocus, this));
         this._register(this.tree.onDidFocus(this.onDidTreeFocus, this));
@@ -494,6 +557,12 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         await this.updateRepository(repository);
         this.repositoryDisposables.deleteAndDispose(repository);
     }
+    onTreeDidOpen(e) {
+        if (!e.element || !isSCMArtifactTreeElement(e.element) || !e.element.artifact.command) {
+            return;
+        }
+        this.commandService.executeCommand(e.element.artifact.command.id, e.element.repository.provider, e.element.artifact);
+    }
     onTreeContextMenu(e) {
         if (!e.element) {
             return;
@@ -652,6 +721,24 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
             }
         }));
     }
+    loadTreeViewState() {
+        const storageViewState = this.storageService.get('scm.repositoriesViewState', StorageScope.WORKSPACE);
+        if (!storageViewState) {
+            return undefined;
+        }
+        try {
+            const treeViewState = JSON.parse(storageViewState);
+            return treeViewState;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    storeTreeViewState() {
+        if (this.tree) {
+            this.storageService.store('scm.repositoriesViewState', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        }
+    }
     dispose() {
         this.visibilityDisposables.dispose();
         super.dispose();
@@ -662,13 +749,15 @@ SCMRepositoriesViewPane = ( __decorate([
     ( __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))
+    ( __param(5, ICommandService)),
+    ( __param(6, IInstantiationService)),
+    ( __param(7, IViewDescriptorService)),
+    ( __param(8, IContextKeyService)),
+    ( __param(9, IConfigurationService)),
+    ( __param(10, IOpenerService)),
+    ( __param(11, IThemeService)),
+    ( __param(12, IHoverService)),
+    ( __param(13, IStorageService))
 ], SCMRepositoriesViewPane));
 
 export { SCMRepositoriesViewPane };

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

@@ -10,7 +10,7 @@ import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { defaultCountBadgeStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuItemAction, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -66,16 +66,13 @@ let RepositoryRenderer = class RepositoryRenderer {
         this.onDidChangeVisibleRepositoriesSignal = observableSignalFromEvent(this, this.scmViewService.onDidChangeVisibleRepositories);
     }
     renderTemplate(container) {
-        if (container.classList.contains('monaco-tl-contents')) {
-            container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
-        }
         const provider = append(container, $('.scm-provider'));
         const icon = append(provider, $('.icon'));
         const label = ( new IconLabel(provider, { supportIcons: false }));
         const actions = append(provider, $('.actions'));
         const toolBar = ( new WorkbenchToolBar(
             actions,
-            { actionViewItemProvider: this.actionViewItemProvider, resetMenu: this.toolbarMenuId, responsive: true },
+            { actionViewItemProvider: this.actionViewItemProvider, resetMenu: this.toolbarMenuId, responsiveBehavior: { enabled: true, minItems: 2 } },
             this.menuService,
             this.contextKeyService,
             this.contextMenuService,

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

@@ -1,6 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPane";
 import { ISCMResourceGroup, ISCMResource, ISCMRepository, ISCMInput, ISCMActionButton, ISCMActionButtonDescriptor, ViewMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm";
 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";
@@ -15,7 +15,7 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITreeNode, ITreeSorter } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
-import { IResourceNode } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/base/common/resourceTree";
+import { IResourceNode } from "@codingame/monaco-vscode-api/vscode/vs/base/common/resourceTree";
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/objectTree";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";