npm - @codingame/monaco-vscode-scm-service-override - Versions diffs - 21.6.0 → 22.0.0 - Mend

@codingame/monaco-vscode-scm-service-override 21.6.0 → 22.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js CHANGED Viewed

@@ -55,75 +55,75 @@ let SCMAccessibilityHelpContentProvider = class SCMAccessibilityHelpContentProvi
         const content = [];
         if (this._scmViewService.visibleRepositories.length > 1) {
             const repositoryList = ( this._scmViewService.visibleRepositories.map(r => r.provider.name)).join(', ');
-            content.push(( localize(9994, "Visible repositories: {0}", repositoryList)));
+            content.push(( localize(10085, "Visible repositories: {0}", repositoryList)));
         }
         const focusedRepository = this._scmViewService.focusedRepository;
         if (focusedRepository) {
-            content.push(( localize(9995, "Repository: {0}", focusedRepository.provider.name)));
+            content.push(( localize(10086, "Repository: {0}", focusedRepository.provider.name)));
             const currentHistoryItemRef = focusedRepository.provider.historyProvider.get()?.historyItemRef.get();
             if (currentHistoryItemRef) {
-                content.push(( localize(9996, "History item reference: {0}", currentHistoryItemRef.name)));
+                content.push(( localize(10087, "History item reference: {0}", currentHistoryItemRef.name)));
             }
             if (focusedRepository.input.visible && focusedRepository.input.enabled && focusedRepository.input.value !== '') {
-                content.push(( localize(9997, "Commit message: {0}", focusedRepository.input.value)));
+                content.push(( localize(10088, "Commit message: {0}", focusedRepository.input.value)));
             }
             const actionButton = focusedRepository.provider.actionButton.get();
             if (actionButton) {
                 const label = actionButton.command.tooltip ?? actionButton.command.title;
-                const enablementLabel = actionButton.enabled ? ( localize(9998, "enabled")) : ( localize(9999, "disabled"));
-                content.push(( localize(10000, "Action button: {0}, {1}", label, enablementLabel)));
+                const enablementLabel = actionButton.enabled ? ( localize(10089, "enabled")) : ( localize(10090, "disabled"));
+                content.push(( localize(10091, "Action button: {0}, {1}", label, enablementLabel)));
             }
             const resourceGroups = [];
             for (const resourceGroup of focusedRepository.provider.groups) {
                 resourceGroups.push(`${resourceGroup.label} (${resourceGroup.resources.length} resource(s))`);
             }
             ( focusedRepository.provider.groups.map(g => g.label)).join(', ');
-            content.push(( localize(10001, "Resource groups: {0}", resourceGroups.join(', '))));
+            content.push(( localize(10092, "Resource groups: {0}", resourceGroups.join(', '))));
         }
         content.push(( localize(
-            10002,
+            10093,
             "Use the \"Source Control: Focus on Source Control Repositories View\" command to open the Source Control Repositories view."
         )));
         content.push(( localize(
-            10003,
+            10094,
             "The Source Control Repositories view lists all repositories from the workspace and is only shown when the workspace contains more than one repository."
         )));
-        content.push(( localize(10004, "Once the Source Control Repositories view is opened you can:")));
+        content.push(( localize(10095, "Once the Source Control Repositories view is opened you can:")));
         content.push(( localize(
-            10005,
+            10096,
             " - Use the up/down arrow keys to navigate the list of repositories."
         )));
-        content.push(( localize(10006, " - Use the Enter or Space keys to select a repository.")));
-        content.push(( localize(10007, " - Use Shift + up/down keys to select multiple repositories.")));
+        content.push(( localize(10097, " - Use the Enter or Space keys to select a repository.")));
+        content.push(( localize(10098, " - Use Shift + up/down keys to select multiple repositories.")));
         content.push(( localize(
-            10008,
+            10099,
             "Use the \"Source Control: Focus on Source Control View\" command to open the Source Control view."
         )));
         content.push(( localize(
-            10009,
+            10100,
             "The Source Control view displays the resource groups and resources of the repository. If the workspace contains more than one repository it will list the resource groups and resources of the repositories selected in the Source Control Repositories view."
         )));
-        content.push(( localize(10010, "Once the Source Control view is opened you can:")));
+        content.push(( localize(10101, "Once the Source Control view is opened you can:")));
         content.push(( localize(
-            10011,
+            10102,
             " - Use the up/down arrow keys to navigate the list of repositories, resource groups and resources."
         )));
-        content.push(( localize(10012, " - Use the Space key to expand or collapse a resource group.")));
+        content.push(( localize(10103, " - Use the Space key to expand or collapse a resource group.")));
         content.push(( localize(
-            10013,
+            10104,
             "Use the \"Source Control: Focus on Source Control Graph View\" command to open the Source Control Graph view."
         )));
         content.push(( localize(
-            10014,
+            10105,
             "The Source Control Graph view displays a graph history items of the repository. If the workspace contains more than one repository it will list the history items of the active repository."
         )));
-        content.push(( localize(10015, "Once the Source Control Graph view is opened you can:")));
+        content.push(( localize(10106, "Once the Source Control Graph view is opened you can:")));
         content.push(( localize(
-            10016,
+            10107,
             " - Use the up/down arrow keys to navigate the list of history items."
         )));
         content.push(( localize(
-            10017,
+            10108,
             " - Use the Space key to open the history item details in the multi-file diff editor."
         )));
         return content.join('\n');

package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { ISCMProvider, ViewMode } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";

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

@@ -31,11 +31,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ViewAction, ViewPane, ViewPaneShowActions } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
+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-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 { renderSCMHistoryItemGraph, historyItemHoverDefaultLabelBackground, historyItemHoverLabelForeground, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, getHistoryItemIndex, toISCMHistoryItemViewModelArray } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/scmHistory';
+import { getHistoryItemEditorTitle, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemChangeNode, isSCMHistoryItemLoadMoreTreeElement, getHistoryItemHoverContent, isSCMRepository, getProviderKey } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-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,14 +65,14 @@ 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-23b6fb38-5e58-5886-b34b-27abc4f5df02-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-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 { ScmHistoryItemResolver } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { ResourceTree } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-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';
@@ -125,23 +125,23 @@ class SCMHistoryItemRefsActionViewItem extends ActionViewItem {
             icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitBranch));
             const name = $('.name');
             if (this._historyItemsFilter === 'all') {
-                name.textContent = ( localize(10036, "All"));
+                name.textContent = ( localize(10127, "All"));
             }
             else if (this._historyItemsFilter === 'auto') {
-                name.textContent = ( localize(10037, "Auto"));
+                name.textContent = ( localize(10128, "Auto"));
             }
             else if (this._historyItemsFilter.length === 1) {
                 name.textContent = this._historyItemsFilter[0].name;
             }
             else {
-                name.textContent = ( localize(10038, "{0} Items", this._historyItemsFilter.length));
+                name.textContent = ( localize(10129, "{0} Items", this._historyItemsFilter.length));
             }
             reset(this.label, icon, name);
         }
     }
     getTooltip() {
         if (this._historyItemsFilter === 'all') {
-            return localize(10039, "All history item references");
+            return localize(10130, "All history item references");
         }
         else if (this._historyItemsFilter === 'auto') {
             const historyProvider = this._repository.provider.historyProvider.get();
@@ -163,7 +163,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_REPOSITORY_ACTION_ID,
-            title: ( localize(10040, "Repository Picker")),
+            title: ( localize(10131, "Repository Picker")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             menu: {
@@ -182,7 +182,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: PICK_HISTORY_ITEM_REFS_ACTION_ID,
-            title: ( localize(10041, "History Item Reference Picker")),
+            title: ( localize(10132, "History Item Reference Picker")),
             icon: Codicon.gitBranch,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)),
@@ -202,7 +202,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.revealCurrentHistoryItem',
-            title: ( localize(10042, "Go to Current History Item")),
+            title: ( localize(10133, "Go to Current History Item")),
             icon: Codicon.target,
             viewId: HISTORY_VIEW_PANE_ID,
             precondition: ( ContextKeyExpr.and(( ContextKeys.SCMHistoryItemCount.notEqualsTo(0)), ( ContextKeys.SCMCurrentHistoryItemRefInFilter.isEqualTo(true)))),
@@ -222,7 +222,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.refresh',
-            title: ( localize(10043, "Refresh")),
+            title: ( localize(10134, "Refresh")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             icon: Codicon.refresh,
@@ -241,7 +241,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setListViewMode',
-            title: ( localize(10044, "View as List")),
+            title: ( localize(10135, "View as List")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.List)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 1 },
@@ -256,7 +256,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.setTreeViewMode',
-            title: ( localize(10045, "View as Tree")),
+            title: ( localize(10136, "View as Tree")),
             viewId: HISTORY_VIEW_PANE_ID,
             toggled: ( ContextKeys.SCMHistoryViewMode.isEqualTo(ViewMode.Tree)),
             menu: { id: MenuId.SCMHistoryTitle, group: '9_viewmode', order: 2 },
@@ -271,7 +271,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.viewChanges',
-            title: ( localize(10046, "Open Changes")),
+            title: ( localize(10137, "Open Changes")),
             icon: Codicon.diffMultiple,
             f1: false,
             menu: [
@@ -307,7 +307,7 @@ registerAction2(class extends Action2 {
         const title = historyItems.length === 1 ?
             getHistoryItemEditorTitle(historyItem) :
             ( localize(
-            10047,
+            10138,
             "All Changes ({0} ↔ {1})",
             historyItemLast.displayId ?? historyItemLast.id,
             historyItem.displayId ?? historyItem.id
@@ -320,7 +320,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.graph.openFile',
-            title: ( localize(10048, "Open File")),
+            title: ( localize(10139, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: [
@@ -329,6 +329,11 @@ registerAction2(class extends Action2 {
                     group: 'inline',
                     order: 1
                 },
+                {
+                    id: MenuId.SCMHistoryItemChangeContext,
+                    group: '0_view',
+                    order: 1
+                }
             ]
         });
     }
@@ -654,7 +659,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(10049, "{0} Load More...", icon)));
+                templateData.historyItemPlaceholderLabel.setLabel(( localize(10140, "{0} Load More...", icon)));
             }));
         }
     }
@@ -714,7 +719,7 @@ SCMHistoryViewPaneActionRunner = ( __decorate([
 ], SCMHistoryViewPaneActionRunner));
 class SCMHistoryTreeAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(10050, "Source Control History");
+        return localize(10141, "Source Control History");
     }
     getAriaLabel(element) {
         if (isSCMRepository(element)) {
@@ -897,7 +902,7 @@ class SCMHistoryTreeDragAndDrop {
     _getTreeElementLabel(element) {
         if (isSCMHistoryItemViewModelTreeElement(element)) {
             const historyItem = element.historyItemViewModel.historyItem;
-            return getHistoryItemEditorTitle(historyItem);
+            return historyItem.displayId ?? historyItem.id;
         }
         return undefined;
     }
@@ -949,7 +954,7 @@ let SCMHistoryViewModel = class SCMHistoryViewModel extends Disposable {
             if (!repository) {
                 return;
             }
-            if (this.repository.get() === repository) {
+            if (this.repository.read(undefined) === repository) {
                 this._selectedRepository.set(Iterable.first(this._scmService.repositories) ?? 'auto', undefined);
             }
             this._repositoryState.delete(repository);
@@ -1157,8 +1162,8 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(10037, "Auto")),
-            description: ( localize(10051, "Show the source control graph for the active repository")),
+            label: ( localize(10128, "Auto")),
+            description: ( localize(10142, "Show the source control graph for the active repository")),
             repository: 'auto'
         };
     }
@@ -1176,7 +1181,7 @@ let RepositoryPicker = class RepositoryPicker {
             repository: r
         }))));
         return this._quickInputService.pick(picks, {
-            placeHolder: ( localize(10052, "Select the repository to view, type to filter all repositories"))
+            placeHolder: ( localize(10143, "Select the repository to view, type to filter all repositories"))
         });
     }
 };
@@ -1192,21 +1197,21 @@ let HistoryItemRefPicker = class HistoryItemRefPicker extends Disposable {
         this._quickInputService = _quickInputService;
         this._allQuickPickItem = {
             id: 'all',
-            label: ( localize(10036, "All")),
-            description: ( localize(10039, "All history item references")),
+            label: ( localize(10127, "All")),
+            description: ( localize(10130, "All history item references")),
             historyItemRef: 'all'
         };
         this._autoQuickPickItem = {
             id: 'auto',
-            label: ( localize(10037, "Auto")),
-            description: ( localize(10053, "Current history item reference(s)")),
+            label: ( localize(10128, "Auto")),
+            description: ( localize(10144, "Current history item reference(s)")),
             historyItemRef: 'auto'
         };
     }
     async pickHistoryItemRef() {
         const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
         this._store.add(quickPick);
-        quickPick.placeholder = ( localize(10054, "Select one/more history item references to view, type to filter"));
+        quickPick.placeholder = ( localize(10145, "Select one/more history item references to view, type to filter"));
         quickPick.canSelectMany = true;
         quickPick.hideCheckAll = true;
         quickPick.busy = true;
@@ -1336,7 +1341,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
         container.appendChild(element.root);
         this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element.root, {
             markdown: {
-                value: ( localize(10055, "Please refresh the graph using the refresh action ($(refresh)).")),
+                value: ( localize(10146, "Please refresh the graph using the refresh action ($(refresh)).")),
                 supportThemeIcons: true
             },
             markdownNotSupportedFallback: undefined
@@ -1402,7 +1407,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                 }));
                 store.add(runOnChange(this._treeViewModel.onDidChangeHistoryItemsFilter, async () => {
                     await this.refresh();
-                    this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.get()));
+                    this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.read(undefined)));
                 }));
                 store.add(autorun(reader => {
                     this._scmCurrentHistoryItemRefHasRemote.set(!!historyProvider.historyItemRemoteRef.read(reader));
@@ -1411,7 +1416,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                     await this._updateChildren();
                 }));
                 this._scmProviderCtx.set(repository.provider.providerId);
-                this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.get()));
+                this._scmCurrentHistoryItemRefInFilter.set(this._isCurrentHistoryItemInFilter(historyItemRefId.read(undefined)));
                 if (!isFirstRun) {
                     this.refresh();
                 }
@@ -1601,66 +1606,77 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
     }
     _onContextMenu(e) {
         const element = e.element;
-        if (!element || !isSCMHistoryItemViewModelTreeElement(element)) {
-            return;
-        }
-        this._contextMenuDisposables.value = ( new DisposableStore());
-        const historyItemRefMenuItems = MenuRegistry.getMenuItems(MenuId.SCMHistoryItemRefContext).filter(item => isIMenuItem(item));
-        if (historyItemRefMenuItems.length > 0 && element.historyItemViewModel.historyItem.references?.length) {
-            const historyItemRefActions = ( new Map());
-            for (const ref of element.historyItemViewModel.historyItem.references) {
-                const contextKeyService = this.scopedContextKeyService.createOverlay([
-                    ['scmHistoryItemRef', ref.id]
-                ]);
-                const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemRefContext, contextKeyService);
-                for (const action of menuActions.flatMap(a => a[1])) {
-                    if (!( historyItemRefActions.has(action.id))) {
-                        historyItemRefActions.set(action.id, []);
+        if (isSCMHistoryItemViewModelTreeElement(element)) {
+            this._contextMenuDisposables.value = ( new DisposableStore());
+            const historyItemRefMenuItems = MenuRegistry.getMenuItems(MenuId.SCMHistoryItemRefContext).filter(item => isIMenuItem(item));
+            if (historyItemRefMenuItems.length > 0 && element.historyItemViewModel.historyItem.references?.length) {
+                const historyItemRefActions = ( new Map());
+                for (const ref of element.historyItemViewModel.historyItem.references) {
+                    const contextKeyService = this.scopedContextKeyService.createOverlay([
+                        ['scmHistoryItemRef', ref.id]
+                    ]);
+                    const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemRefContext, contextKeyService);
+                    for (const action of menuActions.flatMap(a => a[1])) {
+                        if (!( historyItemRefActions.has(action.id))) {
+                            historyItemRefActions.set(action.id, []);
+                        }
+                        historyItemRefActions.get(action.id).push(ref);
                     }
-                    historyItemRefActions.get(action.id).push(ref);
-                }
-            }
-            for (const historyItemRefMenuItem of historyItemRefMenuItems) {
-                const actionId = historyItemRefMenuItem.command.id;
-                if (!( historyItemRefActions.has(actionId))) {
-                    continue;
                 }
-                this._contextMenuDisposables.value.add(MenuRegistry.appendMenuItem(MenuId.SCMHistoryItemContext, {
-                    title: historyItemRefMenuItem.command.title,
-                    submenu: MenuId.for(actionId),
-                    group: historyItemRefMenuItem?.group,
-                    order: historyItemRefMenuItem?.order
-                }));
-                for (const historyItemRef of historyItemRefActions.get(actionId) ?? []) {
-                    this._contextMenuDisposables.value.add(registerAction2(class extends Action2 {
-                        constructor() {
-                            super({
-                                id: `${actionId}.${historyItemRef.id}`,
-                                title: historyItemRef.name,
-                                menu: {
-                                    id: MenuId.for(actionId),
-                                    group: historyItemRef.category
-                                }
-                            });
-                        }
-                        run(accessor, ...args) {
-                            const commandService = accessor.get(ICommandService);
-                            commandService.executeCommand(actionId, ...args, historyItemRef.id);
-                        }
+                for (const historyItemRefMenuItem of historyItemRefMenuItems) {
+                    const actionId = historyItemRefMenuItem.command.id;
+                    if (!( historyItemRefActions.has(actionId))) {
+                        continue;
+                    }
+                    this._contextMenuDisposables.value.add(MenuRegistry.appendMenuItem(MenuId.SCMHistoryItemContext, {
+                        title: historyItemRefMenuItem.command.title,
+                        submenu: MenuId.for(actionId),
+                        group: historyItemRefMenuItem?.group,
+                        order: historyItemRefMenuItem?.order
                     }));
+                    for (const historyItemRef of historyItemRefActions.get(actionId) ?? []) {
+                        this._contextMenuDisposables.value.add(registerAction2(class extends Action2 {
+                            constructor() {
+                                super({
+                                    id: `${actionId}.${historyItemRef.id}`,
+                                    title: historyItemRef.name,
+                                    menu: {
+                                        id: MenuId.for(actionId),
+                                        group: historyItemRef.category
+                                    }
+                                });
+                            }
+                            run(accessor, ...args) {
+                                const commandService = accessor.get(ICommandService);
+                                commandService.executeCommand(actionId, ...args, historyItemRef.id);
+                            }
+                        }));
+                    }
                 }
             }
+            const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemContext, this.scopedContextKeyService, {
+                arg: element.repository.provider,
+                shouldForwardArgs: true
+            }).filter(group => group[0] !== 'inline');
+            this.contextMenuService.showContextMenu({
+                contextKeyService: this.scopedContextKeyService,
+                getAnchor: () => e.anchor,
+                getActions: () => getFlatContextMenuActions(menuActions),
+                getActionsContext: () => element.historyItemViewModel.historyItem
+            });
+        }
+        else if (isSCMHistoryItemChangeViewModelTreeElement(element)) {
+            const menuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemChangeContext, this.scopedContextKeyService, {
+                arg: element.historyItemViewModel.historyItem,
+                shouldForwardArgs: true
+            }).filter(group => group[0] !== 'inline');
+            this.contextMenuService.showContextMenu({
+                contextKeyService: this.scopedContextKeyService,
+                getAnchor: () => e.anchor,
+                getActions: () => getFlatContextMenuActions(menuActions),
+                getActionsContext: () => element.historyItemChange
+            });
         }
-        const historyItemMenuActions = this._menuService.getMenuActions(MenuId.SCMHistoryItemContext, this.scopedContextKeyService, {
-            arg: element.repository.provider,
-            shouldForwardArgs: true
-        }).filter(group => group[0] !== 'inline');
-        this.contextMenuService.showContextMenu({
-            contextKeyService: this.scopedContextKeyService,
-            getAnchor: () => e.anchor,
-            getActions: () => getFlatContextMenuActions(historyItemMenuActions),
-            getActionsContext: () => element.historyItemViewModel.historyItem
-        });
     }
     async _loadMore(cursor) {
         return this._treeLoadMoreSequencer.queue(async () => {

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

@@ -1,4 +1,4 @@
-import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
+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";

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

@@ -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-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
+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, 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, getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-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';
@@ -157,7 +157,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                     return r.provider.label;
                 },
                 getWidgetAriaLabel() {
-                    return localize(10056, "Source Control Repositories");
+                    return localize(10147, "Source Control Repositories");
                 }
             }
         });

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

@@ -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-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/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';

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

@@ -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-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { ISCMResourceGroup, ISCMResource, ISCMRepository, ISCMInput, ISCMActionButton, ISCMActionButtonDescriptor, ViewMode } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/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-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree";
+import { IResourceNode } from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/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";