Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-19 22:42:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 151ef3514e.
This commit is contained in:
Ladislau Szomoru
2025-01-29 15:33:23 +01:00
committed by GitHub
parent abea0f6064
commit 4a24ab7c7e
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/git/package.json
+7 -7
View File
@@ -164,14 +164,14 @@
"title": "%command.stageAll%",
"category": "Git",
"icon": "$(add)",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.stageAllTracked",
"title": "%command.stageAllTracked%",
"category": "Git",
"icon": "$(add)",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.stageAllUntracked",
@@ -244,7 +244,7 @@
"title": "%command.unstageAll%",
"category": "Git",
"icon": "$(remove)",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.unstageSelectedRanges",
@@ -271,14 +271,14 @@
"title": "%command.cleanAll%",
"category": "Git",
"icon": "$(discard)",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.cleanAllTracked",
"title": "%command.cleanAllTracked%",
"category": "Git",
"icon": "$(discard)",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.cleanAllUntracked",
@@ -902,14 +902,14 @@
"title": "%command.viewChanges%",
"icon": "$(diff-multiple)",
"category": "Git",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.viewStagedChanges",
"title": "%command.viewStagedChanges%",
"icon": "$(diff-multiple)",
"category": "Git",
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
"enablement": "!operationInProgress"
},
{
"command": "git.viewUntrackedChanges",
src/vs/workbench/contrib/scm/browser/menus.ts
+9 -11
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, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
import './media/scm.css';
import { localize } from '../../../../nls.js';
import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -70,14 +70,13 @@ interface IContextualResourceMenuItem {
class SCMMenusItem implements IDisposable {
private readonly _resourceGroupMenu = new MutableDisposable<IMenu>();
private _resourceGroupMenu: IMenu | undefined;
get resourceGroupMenu(): IMenu {
const contextKeyService = this.contextKeyService.createOverlay([
['scmResourceGroupResourceCount', this.group.resources.length],
]);
if (!this._resourceGroupMenu) {
this._resourceGroupMenu = this.menuService.createMenu(MenuId.SCMResourceGroupContext, this.contextKeyService);
}
this._resourceGroupMenu.value = this.menuService.createMenu(MenuId.SCMResourceGroupContext, contextKeyService);
return this._resourceGroupMenu.value;
return this._resourceGroupMenu;
}
private _resourceFolderMenu: IMenu | undefined;
@@ -93,9 +92,8 @@ class SCMMenusItem implements IDisposable {
private contextualResourceMenus: Map<string /* contextValue */, IContextualResourceMenuItem> | undefined;
constructor(
private readonly group: ISCMResourceGroup,
private readonly contextKeyService: IContextKeyService,
private readonly menuService: IMenuService
private contextKeyService: IContextKeyService,
private menuService: IMenuService
) { }
getResourceMenu(resource: ISCMResource): IMenu {
@@ -208,7 +206,7 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
['multiDiffEditorEnableViewChanges', group.multiDiffEditorEnableViewChanges],
]);
result = new SCMMenusItem(group, contextKeyService, this.menuService);
result = new SCMMenusItem(contextKeyService, this.menuService);
this.resourceGroupMenusItems.set(group, result);
}