Revert "fix #133960"

This reverts commit d1f8da2.
microsoft · Sep 29, 2021 · 12a0239 · 12a0239
1 parent 024e054
commit 12a0239
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -16,7 +16,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { EndOfLinePreference } from 'vs/editor/common/model';
 import { localize } from 'vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { Action2, ICommandActionTitle, ILocalizedString, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
+import { Action2, ICommandActionTitle, ILocalizedString, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -1872,16 +1872,10 @@ export function registerTerminalActions() {
 		constructor() {
 			super({
 				id: TerminalCommandId.SizeToContentWidthInstance,
-				title: terminalStrings.sizeToContentWidth,
+				title: terminalStrings.toggleSizeToContentWidth,
 				f1: false,
 				category,
-				toggled: TerminalContextKeys.terminalHasFixedWidth,
-				precondition: ContextKeyExpr.and(TerminalContextKeys.processSupported, TerminalContextKeys.isOpen),
-				menu: [{
-					id: MenuId.TerminalTabContext
-				}, {
-					id: MenuId.TerminalInlineTabContext
-				}]
+				precondition: ContextKeyExpr.and(TerminalContextKeys.processSupported, TerminalContextKeys.focus)
 			});
 		}
 		async run(accessor: ServicesAccessor) {

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
@@ -501,6 +501,16 @@ export function setupTerminalMenus(): void {
 					group: ContextMenuGroup.Edit
 				}
 			},
+			{
+				id: MenuId.TerminalInlineTabContext,
+				item: {
+					command: {
+						id: TerminalCommandId.SizeToContentWidthInstance,
+						title: localize('workbench.action.terminal.sizeToContentWidthInstance', "Toggle Size to Content Width")
+					},
+					group: ContextMenuGroup.Edit
+				}
+			},
 			{
 				id: MenuId.TerminalInlineTabContext,
 				item: {
@@ -568,6 +578,16 @@ export function setupTerminalMenus(): void {
 					group: ContextMenuGroup.Edit
 				}
 			},
+			{
+				id: MenuId.TerminalTabContext,
+				item: {
+					command: {
+						id: TerminalCommandId.SizeToContentWidthInstance,
+						title: localize('workbench.action.terminal.sizeToContentWidthInstance', "Toggle Size to Content Width")
+					},
+					group: ContextMenuGroup.Edit
+				}
+			},
 			{
 				id: MenuId.TerminalTabContext,
 				item: {
@@ -641,7 +661,7 @@ export function setupTerminalMenus(): void {
 	MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
 		command: {
 			id: TerminalCommandId.SizeToContentWidth,
-			title: terminalStrings.sizeToContentWidth
+			title: terminalStrings.toggleSizeToContentWidth
 		},
 		when: ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeTerminal),
 		group: '3_files'

diff --git a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
@@ -57,8 +57,8 @@ export const terminalStrings = {
 		value: localize('workbench.action.terminal.rename', "Rename..."),
 		original: 'Rename...'
 	},
-	sizeToContentWidth: {
-		value: localize('workbench.action.terminal.sizeToContentWidthInstance', "Fixed Content Width"),
-		original: 'Fixed Content Width'
+	toggleSizeToContentWidth: {
+		value: localize('workbench.action.terminal.sizeToContentWidthInstance', "Toggle Size to Content Width"),
+		original: 'Toggle Size to Content Width'
 	}
 };