@codingame/monaco-vscode-xterm-common 24.2.0 → 25.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-common",
-  "version": "24.2.0",
+  "version": "25.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on xterm",
   "keywords": [],
@@ -15,9 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.2.0",
-    "@codingame/monaco-vscode-xterm-addons-common": "24.2.0",
-    "@xterm/xterm": "5.6.0-beta.137"
+    "@codingame/monaco-vscode-api": "25.0.0",
+    "@codingame/monaco-vscode-xterm-addons-common": "25.0.0",
+    "@xterm/xterm": "6.1.0-beta.97"
   },
   "exports": {
     ".": {

package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js

@@ -24,7 +24,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
         addExtensionIdentifiers(extSet, ( this._diff.removed.values()));
         addExtensionIdentifiers(extSet, ( this._diff.changed.values()));
         let message = ( localize(
-            11464,
+            11494,
             "The following extensions want to relaunch the terminal to contribute to its environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -32,7 +32,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
     }
     _getActions() {
         return [{
-                label: ( localize(11465, "Relaunch Terminal")),
+                label: ( localize(11495, "Relaunch Terminal")),
                 run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
                 commandId: TerminalCommandId.Relaunch
             }];
@@ -62,7 +62,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
         const extSet = ( new Set());
         addExtensionIdentifiers(extSet, ( this._collection.getVariableMap(scope).values()));
         let message = ( localize(
-            11466,
+            11496,
             "The following extensions have contributed to this terminal's environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -70,7 +70,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
     }
     _getActions(scope) {
         return [{
-                label: ( localize(11467, "Show Environment Contributions")),
+                label: ( localize(11497, "Show Environment Contributions")),
                 run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
                 commandId: TerminalCommandId.ShowEnvironmentContributions
             }];
@@ -101,7 +101,7 @@ function getMergedDescription(collection, scope, extensionService, extSet) {
         }
         const workspaceDescription = workspaceDescriptions.get(ext);
         if (workspaceDescription) {
-            const workspaceSuffix = globalDescription ? ` (${( localize(11468, 'workspace'))})` : '';
+            const workspaceSuffix = globalDescription ? ` (${( localize(11498, 'workspace'))})` : '';
             message.push(`\n- \`${getExtensionName(ext, extensionService)}${workspaceSuffix}\``);
             message.push(`: ${workspaceDescription}`);
         }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalActions.js

@@ -43,7 +43,7 @@ import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vsco
 import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
 import { editorGroupToColumn } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { SIDE_GROUP, AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { ACTIVE_GROUP, SIDE_GROUP, AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
@@ -63,7 +63,7 @@ import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { SeparatorSelectOption } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/selectBox/selectBox';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-const switchTerminalShowTabsTitle = ( localize(11471, "Show Tabs"));
+const switchTerminalShowTabsTitle = ( localize(11501, "Show Tabs"));
 const category = terminalStrings.actionCategory;
 const sharedWhenClause = (() => {
     const terminalAvailable = ( ContextKeyExpr.or(
@@ -87,7 +87,7 @@ async function getCwdForSplit(instance, folders, commandService, configService)
                 }
                 else if (folders.length > 1) {
                     const options = {
-                        placeHolder: ( localize(11472, "Select current working directory for new terminal"))
+                        placeHolder: ( localize(11502, "Select current working directory for new terminal"))
                     };
                     const workspace = await commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]);
                     if (!workspace) {
@@ -105,7 +105,7 @@ async function getCwdForSplit(instance, folders, commandService, configService)
 }
 let TerminalLaunchHelpAction = class TerminalLaunchHelpAction extends Action {
     constructor(_openerService) {
-        super('workbench.action.terminal.launchHelp', ( localize(11473, "Open Help")));
+        super('workbench.action.terminal.launchHelp', ( localize(11503, "Open Help")));
         this._openerService = _openerService;
     }
     async run() {
@@ -213,7 +213,7 @@ function getTerminalServices(accessor) {
 function registerTerminalActions() {
     registerTerminalAction({
         id: TerminalCommandId.NewInActiveWorkspace,
-        title: ( localize2(11474, 'Create New Terminal (In Active Workspace)')),
+        title: ( localize2(11504, 'Create New Terminal (In Active Workspace)')),
         run: async (c) => {
             if (c.service.isProcessSupportRegistered) {
                 const instance = await c.service.createTerminal({ location: c.configService.defaultLocation });
@@ -228,19 +228,19 @@ function registerTerminalActions() {
     refreshTerminalActions([]);
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditor,
-        title: ( localize2(11475, 'Create New Terminal in Editor Area')),
+        title: ( localize2(11505, 'Create New Terminal in Editor Area')),
         run: async (c, _, args) => {
             function isCreateTerminalOptions(obj) {
                 return isObject(obj) && 'location' in obj;
             }
-            const options = isCreateTerminalOptions(args) ? args : { location: TerminalLocation.Editor };
+            const options = isCreateTerminalOptions(args) ? args : { location: { viewColumn: ACTIVE_GROUP } };
             const instance = await c.service.createTerminal(options);
             await instance.focusWhenReady();
         }
     });
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditorSameGroup,
-        title: ( localize2(11475, 'Create New Terminal in Editor Area')),
+        title: ( localize2(11505, 'Create New Terminal in Editor Area')),
         f1: false,
         run: async (c, accessor, args) => {
             const editorGroupsService = accessor.get(IEditorGroupsService);
@@ -254,7 +254,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditorSide,
-        title: ( localize2(11476, 'Create New Terminal in Editor Area to the Side')),
+        title: ( localize2(11506, 'Create New Terminal in Editor Area to the Side')),
         run: async (c) => {
             const instance = await c.service.createTerminal({
                 location: { viewColumn: SIDE_GROUP }
@@ -309,7 +309,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusPreviousPane,
-        title: ( localize2(11477, 'Focus Previous Terminal in Terminal Group')),
+        title: ( localize2(11507, 'Focus Previous Terminal in Terminal Group')),
         keybinding: {
             primary: KeyMod.Alt | KeyCode.LeftArrow,
             secondary: [KeyMod.Alt | KeyCode.UpArrow],
@@ -328,7 +328,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusNextPane,
-        title: ( localize2(11478, 'Focus Next Terminal in Terminal Group')),
+        title: ( localize2(11508, 'Focus Next Terminal in Terminal Group')),
         keybinding: {
             primary: KeyMod.Alt | KeyCode.RightArrow,
             secondary: [KeyMod.Alt | KeyCode.DownArrow],
@@ -347,7 +347,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneLeft,
-        title: ( localize2(11479, 'Resize Terminal Left')),
+        title: ( localize2(11509, 'Resize Terminal Left')),
         keybinding: {
             linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow },
             mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow },
@@ -359,7 +359,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneRight,
-        title: ( localize2(11480, 'Resize Terminal Right')),
+        title: ( localize2(11510, 'Resize Terminal Right')),
         keybinding: {
             linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow },
             mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow },
@@ -371,7 +371,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneUp,
-        title: ( localize2(11481, 'Resize Terminal Up')),
+        title: ( localize2(11511, 'Resize Terminal Up')),
         keybinding: {
             mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.UpArrow },
             when: TerminalContextKeys.focus,
@@ -382,7 +382,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneDown,
-        title: ( localize2(11482, 'Resize Terminal Down')),
+        title: ( localize2(11512, 'Resize Terminal Down')),
         keybinding: {
             mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow },
             when: TerminalContextKeys.focus,
@@ -410,12 +410,12 @@ function registerTerminalActions() {
                 return;
             }
             c.service.setActiveInstance(instance);
-            focusActiveTerminal(instance, c);
+            await focusActiveTerminal(instance, c);
         }
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusTabs,
-        title: ( localize2(11483, 'Focus Terminal Tabs View')),
+        title: ( localize2(11513, 'Focus Terminal Tabs View')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backslash,
             weight: KeybindingWeight.WorkbenchContrib,
@@ -426,7 +426,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusNext,
-        title: ( localize2(11484, 'Focus Next Terminal Group')),
+        title: ( localize2(11514, 'Focus Next Terminal Group')),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.PageDown,
@@ -443,7 +443,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusPrevious,
-        title: ( localize2(11485, 'Focus Previous Terminal Group')),
+        title: ( localize2(11515, 'Focus Previous Terminal Group')),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.PageUp,
@@ -460,7 +460,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.RunSelectedText,
-        title: ( localize2(11486, 'Run Selected Text In Active Terminal')),
+        title: ( localize2(11516, 'Run Selected Text In Active Terminal')),
         run: async (c, accessor) => {
             const codeEditorService = accessor.get(ICodeEditorService);
             const editor = codeEditorService.getActiveCodeEditor();
@@ -483,7 +483,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.RunActiveFile,
-        title: ( localize2(11487, 'Run Active File In Active Terminal')),
+        title: ( localize2(11517, 'Run Active File In Active Terminal')),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor) => {
             const codeEditorService = accessor.get(ICodeEditorService);
@@ -497,7 +497,7 @@ function registerTerminalActions() {
             const isRemote = instance ? instance.hasRemoteAuthority : (workbenchEnvironmentService.remoteAuthority ? true : false);
             const uri = editor.getModel().uri;
             if ((!isRemote && uri.scheme !== Schemas.file && uri.scheme !== Schemas.vscodeUserData) || (isRemote && uri.scheme !== Schemas.vscodeRemote)) {
-                notificationService.warn(( localize(11488, 'Only files on disk can be run in the terminal')));
+                notificationService.warn(( localize(11518, 'Only files on disk can be run in the terminal')));
                 return;
             }
             await instance.sendPath(uri, true);
@@ -506,7 +506,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollDownLine,
-        title: ( localize2(11489, 'Scroll Down (Line)')),
+        title: ( localize2(11519, 'Scroll Down (Line)')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
             linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow },
@@ -518,7 +518,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollDownPage,
-        title: ( localize2(11490, 'Scroll Down (Page)')),
+        title: ( localize2(11520, 'Scroll Down (Page)')),
         keybinding: {
             primary: KeyMod.Shift | KeyCode.PageDown,
             mac: { primary: KeyCode.PageDown },
@@ -530,7 +530,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollToBottom,
-        title: ( localize2(11491, 'Scroll to Bottom')),
+        title: ( localize2(11521, 'Scroll to Bottom')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.End,
             linux: { primary: KeyMod.Shift | KeyCode.End },
@@ -542,7 +542,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollUpLine,
-        title: ( localize2(11492, 'Scroll Up (Line)')),
+        title: ( localize2(11522, 'Scroll Up (Line)')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
             linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow },
@@ -554,7 +554,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollUpPage,
-        title: ( localize2(11493, 'Scroll Up (Page)')),
+        title: ( localize2(11523, 'Scroll Up (Page)')),
         f1: true,
         keybinding: {
             primary: KeyMod.Shift | KeyCode.PageUp,
@@ -567,7 +567,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollToTop,
-        title: ( localize2(11494, 'Scroll to Top')),
+        title: ( localize2(11524, 'Scroll to Top')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.Home,
             linux: { primary: KeyMod.Shift | KeyCode.Home },
@@ -579,7 +579,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ClearSelection,
-        title: ( localize2(11495, 'Clear Selection')),
+        title: ( localize2(11525, 'Clear Selection')),
         keybinding: {
             primary: KeyCode.Escape,
             when: ( ContextKeyExpr.and(
@@ -699,12 +699,12 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.DetachSession,
-        title: ( localize2(11496, 'Detach Session')),
+        title: ( localize2(11526, 'Detach Session')),
         run: (activeInstance) => activeInstance.detachProcessAndDispose(TerminalExitReason.User)
     });
     registerTerminalAction({
         id: TerminalCommandId.AttachToSession,
-        title: ( localize2(11497, 'Attach to Session')),
+        title: ( localize2(11527, 'Attach to Session')),
         run: async (c, accessor) => {
             const quickInputService = accessor.get(IQuickInputService);
             const labelService = accessor.get(ILabelService);
@@ -728,7 +728,7 @@ function registerTerminalActions() {
                 };
             }));
             if (items.length === 0) {
-                notificationService.info(( localize(11498, 'There are no unattached terminals to attach to')));
+                notificationService.info(( localize(11528, 'There are no unattached terminals to attach to')));
                 return;
             }
             const selected = await quickInputService.pick(items, { canPickMany: false });
@@ -802,7 +802,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SelectToPreviousCommand,
-        title: ( localize2(11499, 'Select to Previous Command')),
+        title: ( localize2(11529, 'Select to Previous Command')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
             when: TerminalContextKeys.focus,
@@ -816,7 +816,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SelectToNextCommand,
-        title: ( localize2(11500, 'Select to Next Command')),
+        title: ( localize2(11530, 'Select to Next Command')),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
             when: TerminalContextKeys.focus,
@@ -830,7 +830,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectToPreviousLine,
-        title: ( localize2(11501, 'Select to Previous Line')),
+        title: ( localize2(11531, 'Select to Previous Line')),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (xterm, _, instance) => {
             xterm.markTracker.selectToPreviousLine();
@@ -839,7 +839,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectToNextLine,
-        title: ( localize2(11502, 'Select to Next Line')),
+        title: ( localize2(11532, 'Select to Next Line')),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (xterm, _, instance) => {
             xterm.markTracker.selectToNextLine();
@@ -858,7 +858,7 @@ function registerTerminalActions() {
                         required: ['cwd'],
                         properties: {
                             cwd: {
-                                description: ( localize(11503, "The directory to start the terminal at")),
+                                description: ( localize(11533, "The directory to start the terminal at")),
                                 type: 'string'
                             }
                         },
@@ -887,7 +887,7 @@ function registerTerminalActions() {
                         required: ['name'],
                         properties: {
                             name: {
-                                description: ( localize(11504, "The new name for the terminal")),
+                                description: ( localize(11534, "The new name for the terminal")),
                                 type: 'string',
                                 minLength: 1
                             }
@@ -901,7 +901,7 @@ function registerTerminalActions() {
             const notificationService = accessor.get(INotificationService);
             const name = args ? toOptionalString(args.name) : undefined;
             if (!name) {
-                notificationService.warn(( localize(11505, "No name argument provided")));
+                notificationService.warn(( localize(11535, "No name argument provided")));
                 return;
             }
             activeInstance.rename(name);
@@ -909,7 +909,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.Relaunch,
-        title: ( localize2(11506, 'Relaunch Active Terminal')),
+        title: ( localize2(11536, 'Relaunch Active Terminal')),
         run: (activeInstance) => activeInstance.relaunch()
     });
     registerTerminalAction({
@@ -986,7 +986,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.JoinActiveTab,
-        title: ( localize2(11507, 'Join Terminals')),
+        title: ( localize2(11537, 'Join Terminals')),
         precondition: ( ContextKeyExpr.and(sharedWhenClause.terminalAvailable, ( TerminalContextKeys.tabsSingularSelection.toNegated()))),
         run: async (c, accessor) => {
             const instances = getSelectedViewInstances(accessor);
@@ -997,7 +997,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.Join,
-        title: ( localize2(11508, 'Join Terminals...')),
+        title: ( localize2(11538, 'Join Terminals...')),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor) => {
             const themeService = accessor.get(IThemeService);
@@ -1005,7 +1005,7 @@ function registerTerminalActions() {
             const quickInputService = accessor.get(IQuickInputService);
             const picks = [];
             if (c.groupService.instances.length <= 1) {
-                notificationService.warn(( localize(11509, 'Insufficient terminals for the join action')));
+                notificationService.warn(( localize(11539, 'Insufficient terminals for the join action')));
                 return;
             }
             const otherInstances = c.groupService.instances.filter(i => i.instanceId !== c.groupService.activeInstance?.instanceId);
@@ -1031,7 +1031,7 @@ function registerTerminalActions() {
                 }
             }
             if (picks.length === 0) {
-                notificationService.warn(( localize(11510, 'All terminals are joined already')));
+                notificationService.warn(( localize(11540, 'All terminals are joined already')));
                 return;
             }
             const result = await quickInputService.pick(picks, {});
@@ -1042,7 +1042,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SplitInActiveWorkspace,
-        title: ( localize2(11511, 'Split Terminal (In Active Workspace)')),
+        title: ( localize2(11541, 'Split Terminal (In Active Workspace)')),
         run: async (instance, c) => {
             const newInstance = await c.service.createTerminal({ location: { parentTerminal: instance } });
             if (newInstance?.target !== TerminalLocation.Editor) {
@@ -1052,7 +1052,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectAll,
-        title: ( localize2(11512, 'Select All')),
+        title: ( localize2(11542, 'Select All')),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: [{
                 primary: 0,
@@ -1064,7 +1064,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.New,
-        title: ( localize2(11513, 'Create New Terminal')),
+        title: ( localize2(11543, 'Create New Terminal')),
         precondition: ( ContextKeyExpr.or(
             TerminalContextKeys.processSupported,
             TerminalContextKeys.webExtensionContributedProfile
@@ -1126,7 +1126,7 @@ function registerTerminalActions() {
     }
     registerTerminalAction({
         id: TerminalCommandId.Kill,
-        title: ( localize2(11514, 'Kill the Active Terminal Instance')),
+        title: ( localize2(11544, 'Kill the Active Terminal Instance')),
         precondition: ( ContextKeyExpr.or(sharedWhenClause.terminalAvailable, TerminalContextKeys.isOpen)),
         icon: killTerminalIcon,
         run: async (c) => killInstance(c, c.groupService.activeInstance)
@@ -1140,7 +1140,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.KillAll,
-        title: ( localize2(11515, 'Kill All Terminals')),
+        title: ( localize2(11545, 'Kill All Terminals')),
         precondition: ( ContextKeyExpr.or(sharedWhenClause.terminalAvailable, TerminalContextKeys.isOpen)),
         icon: Codicon.trash,
         run: async (c) => {
@@ -1153,7 +1153,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.KillEditor,
-        title: ( localize2(11516, 'Kill the Active Terminal in Editor Area')),
+        title: ( localize2(11546, 'Kill the Active Terminal in Editor Area')),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.KeyW,
@@ -1199,7 +1199,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.Clear,
-        title: ( localize2(11517, 'Clear')),
+        title: ( localize2(11547, 'Clear')),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: [{
                 primary: 0,
@@ -1211,18 +1211,18 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.SelectDefaultProfile,
-        title: ( localize2(11518, 'Select Default Profile')),
+        title: ( localize2(11548, 'Select Default Profile')),
         run: (c) => c.service.showProfileQuickPick('setDefault')
     });
     registerTerminalAction({
         id: TerminalCommandId.ConfigureTerminalSettings,
-        title: ( localize2(11519, 'Configure Terminal Settings')),
+        title: ( localize2(11549, 'Configure Terminal Settings')),
         precondition: sharedWhenClause.terminalAvailable,
         run: (c, accessor) => accessor.get(IPreferencesService).openSettings({ jsonEditor: false, query: '@feature:terminal' })
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SetDimensions,
-        title: ( localize2(11520, 'Set Fixed Dimensions')),
+        title: ( localize2(11550, 'Set Fixed Dimensions')),
         precondition: sharedWhenClause.terminalAvailable_and_opened,
         run: (activeInstance) => activeInstance.setFixedDimensions()
     });
@@ -1239,7 +1239,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.SwitchTerminal,
-        title: ( localize2(11521, 'Switch Terminal')),
+        title: ( localize2(11551, 'Switch Terminal')),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor, args) => {
             const item = toOptionalString(args);
@@ -1324,7 +1324,7 @@ function getSelectedViewInstances(accessor, args, args2) {
 function validateTerminalName(name) {
     if (!name || name.trim().length === 0) {
         return {
-            content: ( localize(11522, "Providing no name will reset it to the default value")),
+            content: ( localize(11552, "Providing no name will reset it to the default value")),
             severity: Severity.Info
         };
     }
@@ -1347,7 +1347,7 @@ function refreshTerminalActions(detectedProfiles) {
         constructor() {
             super({
                 id: TerminalCommandId.NewWithProfile,
-                title: ( localize2(11523, 'Create New Terminal (With Profile)')),
+                title: ( localize2(11553, 'Create New Terminal (With Profile)')),
                 f1: true,
                 precondition: ( ContextKeyExpr.or(
                     TerminalContextKeys.processSupported,
@@ -1362,18 +1362,18 @@ function refreshTerminalActions(detectedProfiles) {
                                 required: ['profileName'],
                                 properties: {
                                     profileName: {
-                                        description: ( localize(11524, "The name of the profile to create")),
+                                        description: ( localize(11554, "The name of the profile to create")),
                                         type: 'string',
                                         enum: profileEnum.values,
                                         markdownEnumDescriptions: profileEnum.markdownDescriptions
                                     },
                                     location: {
-                                        description: ( localize(11525, "Where to create the terminal")),
+                                        description: ( localize(11555, "Where to create the terminal")),
                                         type: 'string',
                                         enum: ['view', 'editor'],
                                         enumDescriptions: [
-                                            ( localize(11526, 'Create the terminal in the terminal view')),
-                                            ( localize(11527, 'Create the terminal in the editor')),
+                                            ( localize(11556, 'Create the terminal in the terminal view')),
+                                            ( localize(11557, 'Create the terminal in the editor')),
                                         ]
                                     }
                                 }
@@ -1427,7 +1427,7 @@ function refreshTerminalActions(detectedProfiles) {
             const folders = workspaceContextService.getWorkspace().folders;
             if (folders.length > 1) {
                 const options = {
-                    placeHolder: ( localize(11472, "Select current working directory for new terminal"))
+                    placeHolder: ( localize(11502, "Select current working directory for new terminal"))
                 };
                 const workspace = await commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]);
                 if (!workspace) {
@@ -1476,7 +1476,7 @@ async function pickTerminalCwd(accessor, cancel) {
         const label = pair.folder.name;
         const description = pair.isOverridden
             ? ( localize(
-            11528,
+            11558,
             "(Overriden) {0}",
             labelService.getUriLabel(pair.cwd, { relative: !pair.isAbsolute })
         ))
@@ -1489,7 +1489,7 @@ async function pickTerminalCwd(accessor, cancel) {
         };
     }));
     const options = {
-        placeHolder: ( localize(11472, "Select current working directory for new terminal")),
+        placeHolder: ( localize(11502, "Select current working directory for new terminal")),
         matchOnDescription: true,
         canPickMany: false,
     };
@@ -1521,13 +1521,17 @@ function shrinkWorkspaceFolderCwdPairs(pairs) {
     return selectedPairsInOrder;
 }
 async function focusActiveTerminal(instance, c) {
-    if (instance?.target === TerminalLocation.Editor) {
-        await c.editorService.revealActiveEditor();
-        await instance.focusWhenReady(true);
-    }
-    else {
-        await c.groupService.showPanel(true);
+    const target = instance
+        ?? c.service.activeInstance
+        ?? c.editorService.activeInstance
+        ?? c.groupService.activeInstance;
+    if (!target) {
+        if (c.groupService.instances.length > 0) {
+            await c.groupService.showPanel(true);
+        }
+        return;
     }
+    await c.service.focusInstance(target);
 }
 async function renameWithQuickPick(c, accessor, resource) {
     let instance = resource;
@@ -1537,7 +1541,7 @@ async function renameWithQuickPick(c, accessor, resource) {
     if (instance) {
         const title = await accessor.get(IQuickInputService).input({
             value: instance.title,
-            prompt: ( localize(11529, "Enter terminal name")),
+            prompt: ( localize(11559, "Enter terminal name")),
         });
         if (title) {
             instance.rename(title);

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.js

@@ -56,7 +56,7 @@ let TerminalIconPicker = class TerminalIconPicker extends Disposable {
                 target: {
                     targetElements: [body],
                     x: bodyRect.left + (bodyRect.width - dimension.width) / 2,
-                    y: bodyRect.top + this._layoutService.activeContainerOffset.quickPickTop - 2
+                    y: bodyRect.top + this._layoutService.activeContainerOffset.top
                 },
                 position: {
                     hoverPosition: HoverPosition.BELOW,

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.d.ts

@@ -275,6 +275,7 @@ export declare class TerminalInstance extends Disposable implements ITerminalIns
      * Create xterm.js instance and attach data listeners.
      */
     protected _createXterm(): Promise<XtermTerminal | undefined>;
+    private _refreshShellIntegrationInfoStatus;
     runCommand(commandLine: string, shouldExecute: boolean, commandId?: string): Promise<void>;
     detachFromElement(): void;
     attachToElement(container: HTMLElement): void;