development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - rename incoming/outgoing menu contribution (#202068)

Browse source
This commit is contained in:
Ladislau Szomoru 2024-01-09 12:34:27 +01:00 committed by GitHub
parent 429c689545
commit 9808d4e655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/git/package.json
View file

@ -1765,14 +1765,14 @@
"group": "1_modification@3" "group": "1_modification@3"
} }
], ],
"scm/incoming/historyItem/context": [ "scm/incomingChanges/historyItem/context": [
{ {
"command": "git.openCommit", "command": "git.openCommit",
"when": "scmProvider == git && config.multiDiffEditor.experimental.enabled", "when": "scmProvider == git && config.multiDiffEditor.experimental.enabled",
"group": "inline@1" "group": "inline@1"
} }
], ],
"scm/outgoing/historyItem/context": [ "scm/outgoingChanges/historyItem/context": [
{ {
"command": "git.openCommit", "command": "git.openCommit",
"when": "scmProvider == git && config.multiDiffEditor.experimental.enabled", "when": "scmProvider == git && config.multiDiffEditor.experimental.enabled",

4
src/vs/platform/actions/common/actions.ts
View file

@ -107,8 +107,8 @@ export class MenuId {
static readonly OpenEditorsContextShare = new MenuId('OpenEditorsContextShare'); static readonly OpenEditorsContextShare = new MenuId('OpenEditorsContextShare');
static readonly ProblemsPanelContext = new MenuId('ProblemsPanelContext'); static readonly ProblemsPanelContext = new MenuId('ProblemsPanelContext');
static readonly SCMInputBox = new MenuId('SCMInputBox'); static readonly SCMInputBox = new MenuId('SCMInputBox');
static readonly SCMIncomingHistoryItemContext = new MenuId('SCMIncomingHistoryItemContext'); static readonly SCMIncomingChangesHistoryItemContext = new MenuId('SCMIncomingChangesHistoryItemContext');
static readonly SCMOutgoingHistoryItemContext = new MenuId('SCMOutgoingHistoryItemContext'); static readonly SCMOutgoingChangesHistoryItemContext = new MenuId('SCMOutgoingChangesHistoryItemContext');
static readonly SCMChangeContext = new MenuId('SCMChangeContext'); static readonly SCMChangeContext = new MenuId('SCMChangeContext');
static readonly SCMResourceContext = new MenuId('SCMResourceContext'); static readonly SCMResourceContext = new MenuId('SCMResourceContext');
static readonly SCMResourceContextShare = new MenuId('SCMResourceContextShare'); static readonly SCMResourceContextShare = new MenuId('SCMResourceContextShare');

2
src/vs/workbench/contrib/scm/browser/menus.ts
View file

@ -274,7 +274,7 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
]); ]);
const menuId = historyItemGroup.direction === 'incoming' ? const menuId = historyItemGroup.direction === 'incoming' ?
MenuId.SCMIncomingHistoryItemContext : MenuId.SCMOutgoingHistoryItemContext; MenuId.SCMIncomingChangesHistoryItemContext : MenuId.SCMOutgoingChangesHistoryItemContext;
result = this.menuService.createMenu(menuId, contextKeyService); result = this.menuService.createMenu(menuId, contextKeyService);
this.historyItemMenus.set(historyItem, result); this.historyItemMenus.set(historyItem, result);

12
src/vs/workbench/services/actions/common/menusExtensionPoint.ts
View file

@ -151,15 +151,15 @@ const apiMenus: IAPIMenu[] = [
proposed: 'contribSourceControlInputBoxMenu' proposed: 'contribSourceControlInputBoxMenu'
}, },
{ {
key: 'scm/incoming/historyItem/context', key: 'scm/incomingChanges/historyItem/context',
id: MenuId.SCMIncomingHistoryItemContext, id: MenuId.SCMIncomingChangesHistoryItemContext,
description: localize('menus.incomingHistoryItemContext', "The Source Control incoming history item context menu"), description: localize('menus.incomingChangesHistoryItemContext', "The Source Control incoming changes history item context menu"),
proposed: 'contribSourceControlHistoryItemMenu' proposed: 'contribSourceControlHistoryItemMenu'
}, },
{ {
key: 'scm/outgoing/historyItem/context', key: 'scm/outgoingChanges/historyItem/context',
id: MenuId.SCMOutgoingHistoryItemContext, id: MenuId.SCMOutgoingChangesHistoryItemContext,
description: localize('menus.outgoingHistoryItemContext', "The Source Control outgoing history item context menu"), description: localize('menus.outgoingChangesHistoryItemContext', "The Source Control outgoing changes history item context menu"),
proposed: 'contribSourceControlHistoryItemMenu' proposed: 'contribSourceControlHistoryItemMenu'
}, },
{ {

3
src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts vendored
View file

@ -3,5 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
// empty placeholder declaration for the `scm/historyItem/context`-menu contribution point // empty placeholder declaration for the `scm/incomingChanges/historyItem/context`-menu contribution point
// empty placeholder declaration for the `scm/outgoingChanges/historyItem/context`-menu contribution point
// https://github.com/microsoft/vscode/issues/201997 // https://github.com/microsoft/vscode/issues/201997