SCM - add distinct commands/menu items to open a repository in the terminal + setting to control which menu item appears (microsoft#186742)

Author: lszomoru

src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts

@@ -112,6 +112,21 @@ export class ExternalTerminalContribution implements IWorkbenchContribution {
 					description: nls.localize('explorer.openInTerminalKind', "When opening a file from the Explorer in a terminal, determines what kind of terminal will be launched"),
 					default: 'integrated'
 				},
+				'terminal.sourceControlRepositoriesKind': {
+					type: 'string',
+					enum: [
+						'integrated',
+						'external',
+						'both'
+					],
+					enumDescriptions: [
+						nls.localize('terminal.sourceControlRepositoriesKind.integrated', "Use VS Code's integrated terminal."),
+						nls.localize('terminal.sourceControlRepositoriesKind.external', "Use the configured external terminal."),
+						nls.localize('terminal.sourceControlRepositoriesKind.both', "Use the other two together.")
+					],
+					description: nls.localize('sourceControlRepositories.openInTerminalKind', "When opening a repository from the Source Control Repositories view in a terminal, determines what kind of terminal will be launched"),
+					default: 'integrated'
+				},
 				'terminal.external.windowsExec': {
 					type: 'string',
 					description: nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),

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

@@ -367,7 +367,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyMod.Alt | KeyCode.UpArrow
 });
 
-CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider: ISCMProvider) => {
+CommandsRegistry.registerCommand('scm.openInIntegratedTerminal', async (accessor, provider: ISCMProvider) => {
 	if (!provider || !provider.rootUri) {
 		return;
 	}
@@ -376,13 +376,31 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
 	await commandService.executeCommand('openInIntegratedTerminal', provider.rootUri);
 });
 
+CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider: ISCMProvider) => {
+	if (!provider || !provider.rootUri) {
+		return;
+	}
+
+	const commandService = accessor.get(ICommandService);
+	await commandService.executeCommand('openInTerminal', provider.rootUri);
+});
+
 MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
 	group: '100_end',
 	command: {
 		id: 'scm.openInTerminal',
-		title: localize('open in terminal', "Open In Terminal")
+		title: localize('open in external terminal', "Open in External Terminal")
+	},
+	when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
+});
+
+MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
+	group: '100_end',
+	command: {
+		id: 'scm.openInIntegratedTerminal',
+		title: localize('open in integrated terminal', "Open in Integrated Terminal")
 	},
-	when: ContextKeyExpr.equals('scmProviderHasRootUri', true)
+	when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
 });
 
 registerSingleton(ISCMService, SCMService, InstantiationType.Delayed);