SCM - worktree context menu improvements (microsoft#257242)

Author: lszomoru

extensions/git/package.json

@@ -1335,6 +1335,14 @@
           "command": "git.deleteWorktree",
           "when": "false"
         },
+        {
+          "command": "git.openWorktree",
+          "when": "false"
+        },
+        {
+          "command": "git.openWorktreeInNewWindow",
+          "when": "false"
+        },
         {
           "command": "git.deleteWorktreeFromPalette",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount > 1"
@@ -1690,13 +1698,13 @@
         },
         {
           "command": "git.openWorktree",
-          "group": "worktree@1",
-          "when": "scmProvider == git && gitOpenRepositoryCount > 1"
+          "group": "1_worktree@1",
+          "when": "scmProvider == git && scmProviderContext == worktree"
         },
         {
           "command": "git.openWorktreeInNewWindow",
-          "group": "worktree@2",
-          "when": "scmProvider == git && gitOpenRepositoryCount > 1"
+          "group": "1_worktree@2",
+          "when": "scmProvider == git && scmProviderContext == worktree"
         }
       ],
       "scm/resourceGroup/context": [

extensions/git/src/commands.ts

@@ -3482,9 +3482,8 @@ export class CommandCenter {
 	}
 
 	@command('git.openWorktree', { repository: true })
-	async openWorktreeInCurrentWindow(repository: Repository, ...args: SourceControl[]): Promise<void> {
-		// If multiple repositories are selected, no action is taken
-		if (args.length > 0) {
+	async openWorktreeInCurrentWindow(repository: Repository): Promise<void> {
+		if (!repository) {
 			return;
 		}
 
@@ -3493,9 +3492,8 @@ export class CommandCenter {
 	}
 
 	@command('git.openWorktreeInNewWindow', { repository: true })
-	async openWorktreeInNewWindow(repository: Repository, ...args: SourceControl[]): Promise<void> {
-		// If multiple repositories are selected, no action is taken
-		if (args.length > 0) {
+	async openWorktreeInNewWindow(repository: Repository): Promise<void> {
+		if (!repository) {
 			return;
 		}
 

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

@@ -180,17 +180,10 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 	private genericRepositoryMenu: IMenu | undefined;
 	private contextualRepositoryMenus: Map<string /* contextValue */, IContextualMenuItem> | undefined;
 
-	private readonly resourceGroupMenusItems = new Map<ISCMResourceGroup, SCMMenusItem>();
-
-	private _repositoryContextMenu: IMenu | undefined;
-	get repositoryContextMenu(): IMenu {
-		if (!this._repositoryContextMenu) {
-			this._repositoryContextMenu = this.menuService.createMenu(MenuId.SCMSourceControl, this.contextKeyService);
-			this.disposables.add(this._repositoryContextMenu);
-		}
+	private genericRepositoryContextMenu: IMenu | undefined;
+	private contextualRepositoryContextMenus: Map<string /* contextValue */, IContextualMenuItem> | undefined;
 
-		return this._repositoryContextMenu;
-	}
+	private readonly resourceGroupMenusItems = new Map<ISCMResourceGroup, SCMMenusItem>();
 
 	private readonly disposables = new DisposableStore();
 
@@ -247,6 +240,38 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 		return item.menu;
 	}
 
+	getRepositoryContextMenu(repository: ISCMRepository): IMenu {
+		const contextValue = repository.provider.contextValue.get();
+		if (typeof contextValue === 'undefined') {
+			if (!this.genericRepositoryContextMenu) {
+				this.genericRepositoryContextMenu = this.menuService.createMenu(MenuId.SCMSourceControl, this.contextKeyService);
+			}
+
+			return this.genericRepositoryContextMenu;
+		}
+
+		if (!this.contextualRepositoryContextMenus) {
+			this.contextualRepositoryContextMenus = new Map<string, IContextualMenuItem>();
+		}
+
+		let item = this.contextualRepositoryContextMenus.get(contextValue);
+
+		if (!item) {
+			const contextKeyService = this.contextKeyService.createOverlay([['scmProviderContext', contextValue]]);
+			const menu = this.menuService.createMenu(MenuId.SCMSourceControl, contextKeyService);
+
+			item = {
+				menu, dispose() {
+					menu.dispose();
+				}
+			};
+
+			this.contextualRepositoryContextMenus.set(contextValue, item);
+		}
+
+		return item.menu;
+	}
+
 	getResourceGroupMenu(group: ISCMResourceGroup): IMenu {
 		return this.getOrCreateResourceGroupMenusItem(group).getResourceGroupMenu(group);
 	}

src/vs/workbench/contrib/scm/browser/scm.contribution.ts

@@ -557,7 +557,7 @@ CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
 });
 
 MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
-	group: '100_end',
+	group: '99_terminal',
 	command: {
 		id: 'scm.openInTerminal',
 		title: localize('open in external terminal', "Open in External Terminal")
@@ -571,7 +571,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
 });
 
 MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
-	group: '100_end',
+	group: '99_terminal',
 	command: {
 		id: 'scm.openInIntegratedTerminal',
 		title: localize('open in integrated terminal', "Open in Integrated Terminal")

src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts

@@ -241,7 +241,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 
 		const provider = e.element.provider;
 		const menus = this.scmViewService.menus.getRepositoryMenus(provider);
-		const menu = menus.repositoryContextMenu;
+		const menu = menus.getRepositoryContextMenu(e.element);
 		const actions = collectContextMenuActions(menu);
 
 		const disposables = new DisposableStore();

src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts

@@ -37,8 +37,14 @@ export class RepositoryActionRunner extends ActionRunner {
 			return super.runAction(action, context);
 		}
 
+		const actionContext = [context];
+
+		// If the selection contains the repository, add the
+		// other selected repositories to the action context
 		const selection = this.getSelectedRepositories().map(r => r.provider);
-		const actionContext = selection.some(s => s === context) ? selection : [context];
+		if (selection.some(s => s === context)) {
+			actionContext.push(...selection.filter(s => s !== context));
+		}
 
 		await action.run(...actionContext);
 	}

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

@@ -2625,7 +2625,7 @@ export class SCMViewPane extends ViewPane {
 
 		if (isSCMRepository(element)) {
 			const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
-			const menu = menus.repositoryContextMenu;
+			const menu = menus.getRepositoryContextMenu(element);
 			context = element.provider;
 			actionRunner = new RepositoryActionRunner(() => this.getSelectedRepositories());
 			disposables.add(actionRunner);

src/vs/workbench/contrib/scm/common/scm.ts

@@ -193,8 +193,8 @@ export interface ISCMTitleMenu {
 
 export interface ISCMRepositoryMenus {
 	readonly titleMenu: ISCMTitleMenu;
-	readonly repositoryContextMenu: IMenu;
 	getRepositoryMenu(repository: ISCMRepository): IMenu;
+	getRepositoryContextMenu(repository: ISCMRepository): IMenu;
 	getResourceGroupMenu(group: ISCMResourceGroup): IMenu;
 	getResourceMenu(resource: ISCMResource): IMenu;
 	getResourceFolderMenu(group: ISCMResourceGroup): IMenu;