Skip to content

Commit 502a7e5

Browse files
authored
SCM - do not show "Open in External Terminal" action when connected to a remote (microsoft#236697)
1 parent 1b43b07 commit 502a7e5

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
4141
import { QuickDiffModelService, IQuickDiffModelService } from './quickDiffModel.js';
4242
import { QuickDiffEditorController } from './quickDiffWidget.js';
4343
import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
44+
import { RemoteNameContext } from '../../../common/contextkeys.js';
4445

4546
ModesRegistry.registerLanguage({
4647
id: 'scminput',
@@ -529,7 +530,12 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
529530
id: 'scm.openInTerminal',
530531
title: localize('open in external terminal', "Open in External Terminal")
531532
},
532-
when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
533+
when: ContextKeyExpr.and(
534+
RemoteNameContext.isEqualTo(''),
535+
ContextKeyExpr.equals('scmProviderHasRootUri', true),
536+
ContextKeyExpr.or(
537+
ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external'),
538+
ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
533539
});
534540

535541
MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
@@ -538,7 +544,11 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
538544
id: 'scm.openInIntegratedTerminal',
539545
title: localize('open in integrated terminal', "Open in Integrated Terminal")
540546
},
541-
when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
547+
when: ContextKeyExpr.and(
548+
ContextKeyExpr.equals('scmProviderHasRootUri', true),
549+
ContextKeyExpr.or(
550+
ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated'),
551+
ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
542552
});
543553

544554
KeybindingsRegistry.registerCommandAndKeybindingRule({

0 commit comments

Comments
 (0)