Skip to content

Commit 3c021f2

Browse files
Revert "SCM - disable actions for resource groups that do not have any resources (#236813)"
This reverts commit 151ef35.
1 parent f946163 commit 3c021f2

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

code/extensions/git/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@
164164
"title": "%command.stageAll%",
165165
"category": "Git",
166166
"icon": "$(add)",
167-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
167+
"enablement": "!operationInProgress"
168168
},
169169
{
170170
"command": "git.stageAllTracked",
171171
"title": "%command.stageAllTracked%",
172172
"category": "Git",
173173
"icon": "$(add)",
174-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
174+
"enablement": "!operationInProgress"
175175
},
176176
{
177177
"command": "git.stageAllUntracked",
@@ -244,7 +244,7 @@
244244
"title": "%command.unstageAll%",
245245
"category": "Git",
246246
"icon": "$(remove)",
247-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
247+
"enablement": "!operationInProgress"
248248
},
249249
{
250250
"command": "git.unstageSelectedRanges",
@@ -271,14 +271,14 @@
271271
"title": "%command.cleanAll%",
272272
"category": "Git",
273273
"icon": "$(discard)",
274-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
274+
"enablement": "!operationInProgress"
275275
},
276276
{
277277
"command": "git.cleanAllTracked",
278278
"title": "%command.cleanAllTracked%",
279279
"category": "Git",
280280
"icon": "$(discard)",
281-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
281+
"enablement": "!operationInProgress"
282282
},
283283
{
284284
"command": "git.cleanAllUntracked",
@@ -902,14 +902,14 @@
902902
"title": "%command.viewChanges%",
903903
"icon": "$(diff-multiple)",
904904
"category": "Git",
905-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
905+
"enablement": "!operationInProgress"
906906
},
907907
{
908908
"command": "git.viewStagedChanges",
909909
"title": "%command.viewStagedChanges%",
910910
"icon": "$(diff-multiple)",
911911
"category": "Git",
912-
"enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
912+
"enablement": "!operationInProgress"
913913
},
914914
{
915915
"command": "git.viewUntrackedChanges",

code/src/vs/workbench/contrib/scm/browser/menus.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IAction } from '../../../../base/common/actions.js';
77
import { equals } from '../../../../base/common/arrays.js';
88
import { Emitter } from '../../../../base/common/event.js';
9-
import { DisposableStore, IDisposable, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
9+
import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
1010
import './media/scm.css';
1111
import { localize } from '../../../../nls.js';
1212
import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -70,14 +70,13 @@ interface IContextualResourceMenuItem {
7070

7171
class SCMMenusItem implements IDisposable {
7272

73-
private readonly _resourceGroupMenu = new MutableDisposable<IMenu>();
73+
private _resourceGroupMenu: IMenu | undefined;
7474
get resourceGroupMenu(): IMenu {
75-
const contextKeyService = this.contextKeyService.createOverlay([
76-
['scmResourceGroupResourceCount', this.group.resources.length],
77-
]);
75+
if (!this._resourceGroupMenu) {
76+
this._resourceGroupMenu = this.menuService.createMenu(MenuId.SCMResourceGroupContext, this.contextKeyService);
77+
}
7878

79-
this._resourceGroupMenu.value = this.menuService.createMenu(MenuId.SCMResourceGroupContext, contextKeyService);
80-
return this._resourceGroupMenu.value;
79+
return this._resourceGroupMenu;
8180
}
8281

8382
private _resourceFolderMenu: IMenu | undefined;
@@ -93,9 +92,8 @@ class SCMMenusItem implements IDisposable {
9392
private contextualResourceMenus: Map<string /* contextValue */, IContextualResourceMenuItem> | undefined;
9493

9594
constructor(
96-
private readonly group: ISCMResourceGroup,
97-
private readonly contextKeyService: IContextKeyService,
98-
private readonly menuService: IMenuService
95+
private contextKeyService: IContextKeyService,
96+
private menuService: IMenuService
9997
) { }
10098

10199
getResourceMenu(resource: ISCMResource): IMenu {
@@ -208,7 +206,7 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
208206
['multiDiffEditorEnableViewChanges', group.multiDiffEditorEnableViewChanges],
209207
]);
210208

211-
result = new SCMMenusItem(group, contextKeyService, this.menuService);
209+
result = new SCMMenusItem(contextKeyService, this.menuService);
212210
this.resourceGroupMenusItems.set(group, result);
213211
}
214212

0 commit comments

Comments
 (0)