daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCM - disable actions for resource groups that do not have any resources (#236813)

pull/236822/head^2
Ladislau Szomoru 2024-12-22 14:09:59 +01:00 committed by GitHub
parent d953d84d90
commit 151ef3514e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/git/package.json
View File

@ -163,14 +163,14 @@
"title": "%command.stageAll%",
"category": "Git",
"icon": "$(add)",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.stageAllTracked",
"title": "%command.stageAllTracked%",
"category": "Git",
"icon": "$(add)",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.stageAllUntracked",
@ -243,7 +243,7 @@
"title": "%command.unstageAll%",
"category": "Git",
"icon": "$(remove)",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.unstageSelectedRanges",
@ -270,14 +270,14 @@
"title": "%command.cleanAll%",
"category": "Git",
"icon": "$(discard)",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.cleanAllTracked",
"title": "%command.cleanAllTracked%",
"category": "Git",
"icon": "$(discard)",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.cleanAllUntracked",
@ -889,14 +889,14 @@
"title": "%command.viewChanges%",
"icon": "$(diff-multiple)",
"category": "Git",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.viewStagedChanges",
"title": "%command.viewStagedChanges%",
"icon": "$(diff-multiple)",
"category": "Git",
"enablement": "!operationInProgress"
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
},
{
"command": "git.viewUntrackedChanges",

20
src/vs/workbench/contrib/scm/browser/menus.ts
View File

@ -6,7 +6,7 @@
import { IAction } from '../../../../base/common/actions.js';
import { equals } from '../../../../base/common/arrays.js';
import { Emitter } from '../../../../base/common/event.js';
import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
import { DisposableStore, IDisposable, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
import './media/scm.css';
import { localize } from '../../../../nls.js';
import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@ -70,13 +70,14 @@ interface IContextualResourceMenuItem {
class SCMMenusItem implements IDisposable {
private _resourceGroupMenu: IMenu | undefined;
private readonly _resourceGroupMenu = new MutableDisposable<IMenu>();
get resourceGroupMenu(): IMenu {
if (!this._resourceGroupMenu) {
this._resourceGroupMenu = this.menuService.createMenu(MenuId.SCMResourceGroupContext, this.contextKeyService);
}
const contextKeyService = this.contextKeyService.createOverlay([
['scmResourceGroupResourceCount', this.group.resources.length],
]);
return this._resourceGroupMenu;
this._resourceGroupMenu.value = this.menuService.createMenu(MenuId.SCMResourceGroupContext, contextKeyService);
return this._resourceGroupMenu.value;
}
private _resourceFolderMenu: IMenu | undefined;
@ -92,8 +93,9 @@ class SCMMenusItem implements IDisposable {
private contextualResourceMenus: Map<string /* contextValue */, IContextualResourceMenuItem> | undefined;
constructor(
private contextKeyService: IContextKeyService,
private menuService: IMenuService
private readonly group: ISCMResourceGroup,
private readonly contextKeyService: IContextKeyService,
private readonly menuService: IMenuService
) { }
getResourceMenu(resource: ISCMResource): IMenu {
@ -206,7 +208,7 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
['multiDiffEditorEnableViewChanges', group.multiDiffEditorEnableViewChanges],
]);
result = new SCMMenusItem(contextKeyService, this.menuService);
result = new SCMMenusItem(group, contextKeyService, this.menuService);
this.resourceGroupMenusItems.set(group, result);
}