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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-addons-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 addons",
   "keywords": [],
@@ -15,15 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.2.0",
-    "@xterm/addon-clipboard": "0.2.0-beta.120",
-    "@xterm/addon-image": "0.9.0-beta.137",
-    "@xterm/addon-ligatures": "0.10.0-beta.137",
-    "@xterm/addon-progress": "0.2.0-beta.43",
-    "@xterm/addon-search": "0.16.0-beta.137",
-    "@xterm/addon-serialize": "0.14.0-beta.137",
-    "@xterm/addon-unicode11": "0.9.0-beta.137",
-    "@xterm/addon-webgl": "0.19.0-beta.137"
+    "@codingame/monaco-vscode-api": "25.0.0",
+    "@xterm/addon-clipboard": "0.3.0-beta.97",
+    "@xterm/addon-image": "0.10.0-beta.97",
+    "@xterm/addon-ligatures": "0.11.0-beta.97",
+    "@xterm/addon-progress": "0.3.0-beta.97",
+    "@xterm/addon-search": "0.17.0-beta.97",
+    "@xterm/addon-serialize": "0.15.0-beta.97",
+    "@xterm/addon-unicode11": "0.10.0-beta.97",
+    "@xterm/addon-webgl": "0.20.0-beta.96"
   },
   "exports": {
     ".": {

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContext.d.ts

@@ -2,9 +2,9 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatContextValueItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
-import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
-import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatContextValueItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService";
+import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service";
+import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContext.js

@@ -16,16 +16,16 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { UntitledTextEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { FileEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { toToolSetVariableEntry, toToolVariableEntry, OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { ToolSet, ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { isImage } from '../chatPasteProviders.js';
-import { convertBufferToScreenshotVariable } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import { imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
+import { toToolSetVariableEntry, toToolVariableEntry, OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ToolSet, ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { isImage } from '../widget/input/editor/chatPasteProviders.js';
+import { convertBufferToScreenshotVariable } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext';
 import { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
+import { imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 
 let ChatContextContributions = class ChatContextContributions extends Disposable {
     static { this.ID = 'chat.contextContributions'; }
@@ -46,7 +46,7 @@ ChatContextContributions = ( __decorate([
 class ToolsContextPickerPick {
     constructor() {
         this.type = 'pickerPick';
-        this.label = ( localize(4681, 'Tools...'));
+        this.label = ( localize(4707, 'Tools...'));
         this.icon = Codicon.tools;
         this.ordinal = -500;
     }
@@ -95,7 +95,7 @@ class ToolsContextPickerPick {
             picks.push(item);
         }
         return {
-            placeholder: ( localize(4682, 'Select a tool')),
+            placeholder: ( localize(4708, 'Select a tool')),
             picks: Promise.resolve(picks)
         };
     }
@@ -105,7 +105,7 @@ let OpenEditorContextValuePick = class OpenEditorContextValuePick {
         this._editorService = _editorService;
         this._labelService = _labelService;
         this.type = 'valuePick';
-        this.label = ( localize(4683, 'Open Editors'));
+        this.label = ( localize(4709, 'Open Editors'));
         this.icon = Codicon.file;
         this.ordinal = 800;
     }
@@ -141,7 +141,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
         this._chatEditingService = _chatEditingService;
         this._labelService = _labelService;
         this.type = 'pickerPick';
-        this.label = ( localize(4684, 'Related Files'));
+        this.label = ( localize(4710, 'Related Files'));
         this.icon = Codicon.sparkle;
         this.ordinal = 300;
     }
@@ -183,7 +183,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
             }, []));
         })();
         return {
-            placeholder: ( localize(4685, 'Add related files to your working set')),
+            placeholder: ( localize(4711, 'Add related files to your working set')),
             picks,
         };
     }
@@ -196,7 +196,7 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
     constructor(_clipboardService) {
         this._clipboardService = _clipboardService;
         this.type = 'valuePick';
-        this.label = ( localize(4686, 'Image from Clipboard'));
+        this.label = ( localize(4712, 'Image from Clipboard'));
         this.icon = Codicon.fileMedia;
     }
     async isEnabled(widget) {
@@ -213,8 +213,8 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
         const fileBuffer = await this._clipboardService.readImage();
         return {
             id: await imageToHash(fileBuffer),
-            name: ( localize(4687, 'Pasted Image')),
-            fullName: ( localize(4687, 'Pasted Image')),
+            name: ( localize(4713, 'Pasted Image')),
+            fullName: ( localize(4713, 'Pasted Image')),
             value: fileBuffer,
             kind: 'image',
         };
@@ -229,7 +229,7 @@ let TerminalContext = class TerminalContext {
         this._terminalService = _terminalService;
         this.type = 'valuePick';
         this.icon = Codicon.terminal;
-        this.label = ( localize(4688, 'Terminal'));
+        this.label = ( localize(4714, 'Terminal'));
     }
     isEnabled(widget) {
         const terminal = this._terminalService.getInstanceFromResource(this._resource);
@@ -297,8 +297,8 @@ let ScreenshotContextValuePick = class ScreenshotContextValuePick {
         this.type = 'valuePick';
         this.icon = Codicon.deviceCamera;
         this.label = (isElectron
-            ? ( localize(4689, 'Screenshot Window'))
-            : ( localize(4690, 'Screenshot')));
+            ? ( localize(4715, 'Screenshot Window'))
+            : ( localize(4716, 'Screenshot')));
     }
     async isEnabled(widget) {
         return !!widget.attachmentCapabilities.supportsImageAttachments && !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.d.ts

@@ -1,6 +1,6 @@
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
-import { IChatContextPickerItem, IChatContextPicker } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
+import { IChatContextPickerItem, IChatContextPicker } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService";
 /**
  * Helper to register the `Attach Prompt` action.
  */

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -13,7 +13,7 @@ import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 
@@ -23,8 +23,8 @@ class ManageInstructionsFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_INSTRUCTIONS_ACTION_ID,
-            title: ( localize2(5750, "Configure Instructions...")),
-            shortTitle: ( localize2(5751, "Chat Instructions")),
+            title: ( localize2(5452, "Configure Instructions...")),
+            shortTitle: ( localize2(5453, "Chat Instructions")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -41,7 +41,7 @@ class ManageInstructionsFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(5752, 'Select the instructions file to open'));
+        const placeholder = ( localize(5454, 'Select the instructions file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.instructions, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -55,7 +55,7 @@ let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
     constructor(promptsService) {
         this.promptsService = promptsService;
         this.type = 'pickerPick';
-        this.label = ( localize(5753, 'Instructions...'));
+        this.label = ( localize(5455, 'Instructions...'));
         this.icon = Codicon.bookmark;
         this.commandId = ATTACH_INSTRUCTIONS_ACTION_ID;
     }
@@ -85,10 +85,10 @@ let ChatInstructionsPickerPick = class ChatInstructionsPickerPick {
             return result;
         });
         return {
-            placeholder: ( localize(5754, 'Select instructions files to attach')),
+            placeholder: ( localize(5456, 'Select instructions files to attach')),
             picks,
             configure: {
-                label: ( localize(5755, 'Configure Instructions...')),
+                label: ( localize(5457, 'Configure Instructions...')),
                 commandId: CONFIGURE_INSTRUCTIONS_ACTION_ID
             }
         };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.js

@@ -18,7 +18,7 @@ import { SyncResource } from '@codingame/monaco-vscode-api/vscode/vs/platform/us
 import { IUserDataSyncEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { CONFIGURE_SYNC_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataSync/common/userDataSync';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { askForPromptFileName } from './pickers/askForPromptName.js';
 import { askForPromptSourceFolder } from './pickers/askForPromptSourceFolder.js';
@@ -82,11 +82,11 @@ class AbstractNewPromptFileAction extends Action2 {
             return;
         }
         notificationService.prompt(Severity.Info, ( localize(
-            5761,
+            5463,
             "Do you want to backup and sync your user prompt, instruction and custom agent files with Setting Sync?'"
         )), [
             {
-                label: ( localize(5762, "Enable")),
+                label: ( localize(5464, "Enable")),
                 run: () => {
                     commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)
                         .catch((error) => {
@@ -95,7 +95,7 @@ class AbstractNewPromptFileAction extends Action2 {
                 },
             },
             {
-                label: ( localize(5763, "Learn More")),
+                label: ( localize(5465, "Learn More")),
                 run: () => {
                     openerService.open(( URI.parse('https://aka.ms/vscode-settings-sync-help')));
                 },
@@ -143,24 +143,24 @@ const NEW_INSTRUCTIONS_COMMAND_ID = 'workbench.command.new.instructions';
 const NEW_AGENT_COMMAND_ID = 'workbench.command.new.agent';
 class NewPromptFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_PROMPT_COMMAND_ID, ( localize(5764, "New Prompt File...")), PromptsType.prompt);
+        super(NEW_PROMPT_COMMAND_ID, ( localize(5466, "New Prompt File...")), PromptsType.prompt);
     }
 }
 class NewInstructionsFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5765, "New Instructions File...")), PromptsType.instructions);
+        super(NEW_INSTRUCTIONS_COMMAND_ID, ( localize(5467, "New Instructions File...")), PromptsType.instructions);
     }
 }
 class NewAgentFileAction extends AbstractNewPromptFileAction {
     constructor() {
-        super(NEW_AGENT_COMMAND_ID, ( localize(5766, "New Custom Agent...")), PromptsType.agent);
+        super(NEW_AGENT_COMMAND_ID, ( localize(5468, "New Custom Agent...")), PromptsType.agent);
     }
 }
 class NewUntitledPromptFileAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.command.new.untitled.prompt',
-            title: ( localize2(5767, "New Untitled Prompt File")),
+            title: ( localize2(5469, "New Untitled Prompt File")),
             f1: true,
             precondition: ChatContextKeys.enabled,
             category: CHAT_CATEGORY,

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName.js

@@ -25,20 +25,20 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
         const fileName = sanitizeInput(value);
         if (!fileName) {
             return {
-                content: ( localize(5768, "Please enter a name.")),
+                content: ( localize(5470, "Please enter a name.")),
                 severity: Severity.Warning
             };
         }
         if (!isValidBasename(fileName)) {
             return {
-                content: ( localize(5769, "The name contains invalid characters.")),
+                content: ( localize(5471, "The name contains invalid characters.")),
                 severity: Severity.Error
             };
         }
         const fileUri = URI.joinPath(selectedFolder, fileName);
         if (await fileService.exists(fileUri)) {
             return {
-                content: ( localize(5770, "A file for the given name already exists.")),
+                content: ( localize(5472, "A file for the given name already exists.")),
                 severity: Severity.Error
             };
         }
@@ -54,11 +54,11 @@ async function askForPromptFileName(accessor, type, selectedFolder, existingFile
 function getPlaceholderStringForNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5771, "Enter the name of the instructions file");
+            return localize(5473, "Enter the name of the instructions file");
         case PromptsType.prompt:
-            return localize(5772, "Enter the name of the prompt file");
+            return localize(5474, "Enter the name of the prompt file");
         case PromptsType.agent:
-            return localize(5773, "Enter the name of the agent file");
+            return localize(5475, "Enter the name of the agent file");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -66,11 +66,11 @@ function getPlaceholderStringForNew(type) {
 function getPlaceholderStringForRename(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5774, "Enter a new name of the instructions file");
+            return localize(5476, "Enter a new name of the instructions file");
         case PromptsType.prompt:
-            return localize(5775, "Enter a new name of the prompt file");
+            return localize(5477, "Enter a new name of the prompt file");
         case PromptsType.agent:
-            return localize(5776, "Enter a new name of the agent file");
+            return localize(5478, "Enter a new name of the agent file");
         default:
             throw ( new Error('Unknown prompt type'));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder.js

@@ -27,7 +27,7 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
     };
     const foldersList = ( folders.map(folder => {
         const uri = folder.uri;
-        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5777, "Current Location")) : undefined;
+        const detail = (existingFolder && isEqual(uri, existingFolder)) ? ( localize(5479, "Current Location")) : undefined;
         if (folder.storage !== PromptsStorage.local) {
             return {
                 type: 'item',
@@ -51,7 +51,7 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
         }
         return {
             type: 'item',
-            label: ( localize(5778, "Current Workspace")),
+            label: ( localize(5480, "Current Workspace")),
             detail,
             tooltip: labelService.getUriLabel(uri),
             folder,
@@ -66,11 +66,11 @@ async function askForPromptSourceFolder(accessor, type, existingFolder, isMove =
 function getPlaceholderStringforNew(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5779, "Select a location to create the instructions file in...");
+            return localize(5481, "Select a location to create the instructions file");
         case PromptsType.prompt:
-            return localize(5780, "Select a location to create the prompt file in...");
+            return localize(5482, "Select a location to create the prompt file");
         case PromptsType.agent:
-            return localize(5781, "Select a location to create the agent file in...");
+            return localize(5483, "Select a location to create the agent file");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -79,22 +79,22 @@ function getPlaceholderStringforMove(type, isMove) {
     if (isMove) {
         switch (type) {
             case PromptsType.instructions:
-                return localize(5782, "Select a location to move the instructions file to...");
+                return localize(5484, "Select a location to move the instructions file to");
             case PromptsType.prompt:
-                return localize(5783, "Select a location to move the prompt file to...");
+                return localize(5485, "Select a location to move the prompt file to");
             case PromptsType.agent:
-                return localize(5784, "Select a location to move the agent file to...");
+                return localize(5486, "Select a location to move the agent file to");
             default:
                 throw ( new Error('Unknown prompt type'));
         }
     }
     switch (type) {
         case PromptsType.instructions:
-            return localize(5785, "Select a location to copy the instructions file to...");
+            return localize(5487, "Select a location to copy the instructions file to");
         case PromptsType.prompt:
-            return localize(5786, "Select a location to copy the prompt file to...");
+            return localize(5488, "Select a location to copy the prompt file to");
         case PromptsType.agent:
-            return localize(5787, "Select a location to copy the agent file to...");
+            return localize(5489, "Select a location to copy the agent file to");
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -120,11 +120,11 @@ async function showNoFoldersDialog(accessor, type) {
 function getLearnLabel(type) {
     switch (type) {
         case PromptsType.prompt:
-            return localize(5788, 'Learn how to configure reusable prompts');
+            return localize(5490, 'Learn how to configure reusable prompts');
         case PromptsType.instructions:
-            return localize(5789, 'Learn how to configure reusable instructions');
+            return localize(5491, 'Learn how to configure reusable instructions');
         case PromptsType.agent:
-            return localize(5790, 'Learn how to configure custom agents');
+            return localize(5492, 'Learn how to configure custom agents');
         default:
             throw ( new Error('Unknown prompt type'));
     }
@@ -132,11 +132,11 @@ function getLearnLabel(type) {
 function getMissingSourceFolderString(type) {
     switch (type) {
         case PromptsType.instructions:
-            return localize(5791, 'No instruction source folders found.');
+            return localize(5493, 'No instruction source folders found.');
         case PromptsType.prompt:
-            return localize(5792, 'No prompt source folders found.');
+            return localize(5494, 'No prompt source folders found.');
         case PromptsType.agent:
-            return localize(5793, 'No agent source folders found.');
+            return localize(5495, 'No agent source folders found.');
         default:
             throw ( new Error('Unknown prompt type'));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.js

@@ -30,19 +30,19 @@ function newHelpButton(type) {
     switch (type) {
         case PromptsType.prompt:
             return {
-                tooltip: ( localize(5794, "Show help on prompt files")),
+                tooltip: ( localize(5496, "Show help on prompt files")),
                 helpURI: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
                 iconClass
             };
         case PromptsType.instructions:
             return {
-                tooltip: ( localize(5795, "Show help on instruction files")),
+                tooltip: ( localize(5497, "Show help on instruction files")),
                 helpURI: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
                 iconClass
             };
         case PromptsType.agent:
             return {
-                tooltip: ( localize(5796, "Show help on custom agent files")),
+                tooltip: ( localize(5498, "Show help on custom agent files")),
                 helpURI: ( URI.parse(AGENT_DOCUMENTATION_URL)),
                 iconClass
             };
@@ -56,7 +56,7 @@ function isPromptFileItem(item) {
 }
 const NEW_PROMPT_FILE_OPTION = {
     type: 'item',
-    label: `$(plus) ${( localize(5797, 'New prompt file...'))}`,
+    label: `$(plus) ${( localize(5499, 'New prompt file...'))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.prompt)],
@@ -64,7 +64,7 @@ const NEW_PROMPT_FILE_OPTION = {
 };
 const NEW_INSTRUCTIONS_FILE_OPTION = {
     type: 'item',
-    label: `$(plus) ${( localize(5798, 'New instruction file...'))}`,
+    label: `$(plus) ${( localize(5500, 'New instruction file...'))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
@@ -72,7 +72,7 @@ const NEW_INSTRUCTIONS_FILE_OPTION = {
 };
 const UPDATE_INSTRUCTIONS_OPTION = {
     type: 'item',
-    label: `$(refresh) ${( localize(5799, 'Generate agent instructions...'))}`,
+    label: `$(refresh) ${( localize(5501, 'Generate agent instructions...'))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
@@ -80,35 +80,35 @@ const UPDATE_INSTRUCTIONS_OPTION = {
 };
 const NEW_AGENT_FILE_OPTION = {
     type: 'item',
-    label: `$(plus) ${( localize(5800, 'Create new custom agent...'))}`,
+    label: `$(plus) ${( localize(5502, 'Create new custom agent...'))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.agent)],
     commandId: NEW_AGENT_COMMAND_ID,
 };
 const EDIT_BUTTON = {
-    tooltip: ( localize(5801, "Open in Editor")),
+    tooltip: ( localize(5503, "Open in Editor")),
     iconClass: ThemeIcon.asClassName(Codicon.fileCode),
 };
 const DELETE_BUTTON = {
-    tooltip: ( localize(5802, "Delete")),
+    tooltip: ( localize(5504, "Delete")),
     iconClass: ThemeIcon.asClassName(Codicon.trash),
 };
 const RENAME_BUTTON = {
-    tooltip: ( localize(5803, "Move and/or Rename")),
+    tooltip: ( localize(5505, "Move and/or Rename")),
     iconClass: ThemeIcon.asClassName(Codicon.replace),
 };
 const COPY_BUTTON = {
-    tooltip: ( localize(5804, "Copy")),
+    tooltip: ( localize(5506, "Make a Copy")),
     iconClass: ThemeIcon.asClassName(Codicon.copy),
 };
 const MAKE_VISIBLE_BUTTON = {
-    tooltip: ( localize(5805, "Hidden from chat view agent picker. Click to show.")),
+    tooltip: ( localize(5507, "Hidden from chat view agent picker. Click to show.")),
     iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
     alwaysVisible: true,
 };
 const MAKE_INVISIBLE_BUTTON = {
-    tooltip: ( localize(5806, "Hide from agent picker")),
+    tooltip: ( localize(5508, "Hide from agent picker")),
     iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
 };
 let PromptFilePickers = class PromptFilePickers {
@@ -127,7 +127,7 @@ let PromptFilePickers = class PromptFilePickers {
         const cts = ( new CancellationTokenSource());
         const quickPick = this._quickInputService.createQuickPick({ useSeparators: true });
         quickPick.busy = true;
-        quickPick.placeholder = ( localize(5807, 'Searching file system...'));
+        quickPick.placeholder = ( localize(5509, 'Searching file system...'));
         try {
             const fileOptions = await this._createPromptPickItems(options, cts.token);
             const activeItem = options.resource && fileOptions.find(f => f.type === 'item' && extUri.isEqual(f.promptFileUri, options.resource));
@@ -213,7 +213,7 @@ let PromptFilePickers = class PromptFilePickers {
         }
         const locals = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.local, token);
         if (locals.length) {
-            result.push({ type: 'separator', label: ( localize(5808, "Workspace")) });
+            result.push({ type: 'separator', label: ( localize(5510, "Workspace")) });
             result.push(...(await Promise.all(( locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token))))));
         }
         let agentInstructionFiles = [];
@@ -236,12 +236,12 @@ let PromptFilePickers = class PromptFilePickers {
         }
         if (agentInstructionFiles.length) {
             const agentButtons = buttons.filter(b => b !== RENAME_BUTTON);
-            result.push({ type: 'separator', label: ( localize(5809, "Agent Instructions")) });
+            result.push({ type: 'separator', label: ( localize(5511, "Agent Instructions")) });
             result.push(...(await Promise.all(( agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token))))));
         }
         const exts = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token);
         if (exts.length) {
-            result.push({ type: 'separator', label: ( localize(5810, "Extensions")) });
+            result.push({ type: 'separator', label: ( localize(5512, "Extensions")) });
             const extButtons = [];
             if (options.optionEdit !== false) {
                 extButtons.push(EDIT_BUTTON);
@@ -253,7 +253,7 @@ let PromptFilePickers = class PromptFilePickers {
         }
         const users = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.user, token);
         if (users.length) {
-            result.push({ type: 'separator', label: ( localize(5811, "User Data")) });
+            result.push({ type: 'separator', label: ( localize(5513, "User Data")) });
             result.push(...(await Promise.all(( users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token))))));
         }
         return result;
@@ -289,8 +289,8 @@ let PromptFilePickers = class PromptFilePickers {
         let iconClass;
         if (visibility === false) {
             buttons = (buttons ?? []).concat(MAKE_VISIBLE_BUTTON);
-            promptName = ( localize(5812, "{0} (hidden)", promptName));
-            tooltip = ( localize(5813, "Hidden from chat view agent picker"));
+            promptName = ( localize(5514, "{0} (hidden)", promptName));
+            tooltip = ( localize(5515, "Hidden from chat view agent picker"));
         }
         else if (visibility === true) {
             buttons = (buttons ?? []).concat(MAKE_INVISIBLE_BUTTON);
@@ -358,7 +358,7 @@ let PromptFilePickers = class PromptFilePickers {
         if (button === DELETE_BUTTON) {
             return await this.keepQuickPickOpen(quickPick, async () => {
                 const filename = getCleanPromptName(value);
-                const message = ( localize(5814, "Are you sure you want to delete '{0}'?", filename));
+                const message = ( localize(5516, "Are you sure you want to delete '{0}'?", filename));
                 const { confirmed } = await this._dialogService.confirm({ message });
                 if (!confirmed) {
                     return false;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatPasteProviders.js → widget/input/editor/chatPasteProviders.js}

@@ -18,10 +18,10 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
+import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { cleanupOldImages, createFileForMedia, resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { cleanupOldImages, createFileForMedia, resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 
 var CopyAttachmentsProvider_1;
 const COPY_MIME_TYPES = 'application/vnd.code.additional-editor-data';
@@ -72,7 +72,7 @@ let PasteImageProvider = class PasteImageProvider {
             return;
         }
         const attachedVariables = widget.attachmentModel.attachments;
-        const displayName = ( localize(5457, 'Pasted Image'));
+        const displayName = ( localize(5845, 'Pasted Image'));
         let tempDisplayName = displayName;
         for (let appendValue = 2; ( attachedVariables.some(attachment => attachment.name === tempDisplayName)); appendValue++) {
             tempDisplayName = `${displayName} ${appendValue}`;
@@ -93,7 +93,7 @@ let PasteImageProvider = class PasteImageProvider {
         if (( currentContextIds.has(scaledImageContext.id))) {
             return;
         }
-        const edit = createCustomPasteEdit(model, [scaledImageContext], mimeType, this.kind, ( localize(5458, 'Pasted Image Attachment')), this.chatWidgetService);
+        const edit = createCustomPasteEdit(model, [scaledImageContext], mimeType, this.kind, ( localize(5846, 'Pasted Image Attachment')), this.chatWidgetService);
         return createEditSession(edit);
     }
 };
@@ -202,7 +202,7 @@ let CopyAttachmentsProvider = class CopyAttachmentsProvider {
         }
         const edit = {
             insertText: textdata,
-            title: ( localize(5459, 'Insert Prompt & Attachments')),
+            title: ( localize(5847, 'Insert Prompt & Attachments')),
             kind: this.kind,
             handledMimeType: CopyAttachmentsProvider_1.ATTACHMENT_MIME_TYPE,
             additionalEdit: {
@@ -276,7 +276,7 @@ class PasteTextProvider {
         if (( currentContextIds.has(copiedContext.id))) {
             return;
         }
-        const edit = createCustomPasteEdit(model, [copiedContext], Mimes.text, this.kind, ( localize(5460, 'Pasted Code Attachment')), this.chatWidgetService);
+        const edit = createCustomPasteEdit(model, [copiedContext], Mimes.text, this.kind, ( localize(5848, 'Pasted Code Attachment')), this.chatWidgetService);
         edit.yieldTo = [{ kind: HierarchicalKind.Empty.append('text', 'plain') }];
         return createEditSession(edit);
     }
@@ -286,7 +286,7 @@ function getCopiedContext(code, file, language, range) {
     const start = range.startLineNumber;
     const end = range.endLineNumber;
     const resultText = `Copied Selection of Code: \n\n\n From the file: ${fileName} From lines ${start} to ${end} \n \`\`\`${code}\`\`\``;
-    const pastedLines = start === end ? ( localize(5461, '1 line')) : ( localize(5462, '{0} lines', end + 1 - start));
+    const pastedLines = start === end ? ( localize(5849, '1 line')) : ( localize(5850, '{0} lines', end + 1 - start));
     return {
         kind: 'paste',
         value: resultText,
@@ -310,7 +310,7 @@ function getCopiedContext(code, file, language, range) {
 function createCustomPasteEdit(model, context, handledMimeType, kind, title, chatWidgetService) {
     const label = context.length === 1
         ? context[0].name
-        : ( localize(5463, '{0} and {1} more', context[0].name, context.length - 1));
+        : ( localize(5851, '{0} and {1} more', context[0].name, context.length - 1));
     const customEdit = {
         resource: model.uri,
         variable: context,

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

@@ -14,7 +14,7 @@ import { type IDecorationAddon } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
+import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -25,7 +25,7 @@ import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { TerminalContext } from '../../../chat/browser/actions/chatContext.js';
@@ -371,7 +371,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         ];
     }
     _getContextMenuActions() {
-        const label = ( localize(11647, "Toggle Visibility"));
+        const label = ( localize(11677, "Toggle Visibility"));
         return [
             {
                 class: undefined, tooltip: label, id: 'terminal.toggleVisibility', label, enabled: true,
@@ -392,7 +392,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             actions.push(attachToChatAction, ( new Separator()));
         }
         if (command.command !== '') {
-            const labelRun = ( localize(11648, 'Rerun Command'));
+            const labelRun = ( localize(11678, 'Rerun Command'));
             actions.push({
                 class: undefined, tooltip: labelRun, id: 'terminal.rerunCommand', label: labelRun, enabled: true,
                 run: async () => {
@@ -401,11 +401,11 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                     if (!command.isTrusted) {
                         const shouldRun = await ( new Promise(r => {
-                            this._notificationService.prompt(Severity.Info, ( localize(11649, 'Do you want to run the command: {0}', command.command)), [{
-                                    label: ( localize(11650, 'Yes')),
+                            this._notificationService.prompt(Severity.Info, ( localize(11679, 'Do you want to run the command: {0}', command.command)), [{
+                                    label: ( localize(11680, 'Yes')),
                                     run: () => r(true)
                                 }, {
-                                    label: ( localize(11651, 'No')),
+                                    label: ( localize(11681, 'No')),
                                     run: () => r(false)
                                 }]);
                         }));
@@ -417,14 +417,14 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                 }
             });
             actions.push(( new Separator()));
-            const labelCopy = ( localize(11652, 'Copy Command'));
+            const labelCopy = ( localize(11682, 'Copy Command'));
             actions.push({
                 class: undefined, tooltip: labelCopy, id: 'terminal.copyCommand', label: labelCopy, enabled: true,
                 run: () => this._clipboardService.writeText(command.command)
             });
         }
         if (command.hasOutput()) {
-            const labelCopyCommandAndOutput = ( localize(11653, 'Copy Command and Output'));
+            const labelCopyCommandAndOutput = ( localize(11683, 'Copy Command and Output'));
             actions.push({
                 class: undefined, tooltip: labelCopyCommandAndOutput, id: 'terminal.copyCommandAndOutput', label: labelCopyCommandAndOutput, enabled: true,
                 run: () => {
@@ -434,7 +434,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelText = ( localize(11654, 'Copy Output'));
+            const labelText = ( localize(11684, 'Copy Output'));
             actions.push({
                 class: undefined, tooltip: labelText, id: 'terminal.copyOutput', label: labelText, enabled: true,
                 run: () => {
@@ -444,7 +444,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelHtml = ( localize(11655, 'Copy Output as HTML'));
+            const labelHtml = ( localize(11685, 'Copy Output as HTML'));
             actions.push({
                 class: undefined, tooltip: labelHtml, id: 'terminal.copyOutputAsHtml', label: labelHtml, enabled: true,
                 run: () => this._onDidRequestCopyAsHtml.fire({ command })
@@ -453,18 +453,18 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (actions.length > 0) {
             actions.push(( new Separator()));
         }
-        const labelRunRecent = ( localize(11656, "Run Recent Command"));
+        const labelRunRecent = ( localize(11686, "Run Recent Command"));
         actions.push({
             class: undefined, tooltip: labelRunRecent, id: 'workbench.action.terminal.runRecentCommand', label: labelRunRecent, enabled: true,
             run: () => this._commandService.executeCommand('workbench.action.terminal.runRecentCommand')
         });
-        const labelGoToRecent = ( localize(11657, "Go To Recent Directory"));
+        const labelGoToRecent = ( localize(11687, "Go To Recent Directory"));
         actions.push({
             class: undefined, tooltip: labelRunRecent, id: 'workbench.action.terminal.goToRecentDirectory', label: labelGoToRecent, enabled: true,
             run: () => this._commandService.executeCommand('workbench.action.terminal.goToRecentDirectory')
         });
         actions.push(( new Separator()));
-        const labelAbout = ( localize(11658, 'Learn About Shell Integration'));
+        const labelAbout = ( localize(11688, 'Learn About Shell Integration'));
         actions.push({
             class: undefined, tooltip: labelAbout, id: 'terminal.learnShellIntegration', label: labelAbout, enabled: true,
             run: () => this._openerService.open('https://code.visualstudio.com/docs/terminal/shell-integration')
@@ -476,7 +476,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (!chatIsEnabled) {
             return undefined;
         }
-        const labelAttachToChat = ( localize(11659, 'Attach To Chat'));
+        const labelAttachToChat = ( localize(11689, 'Attach To Chat'));
         return {
             class: undefined, tooltip: labelAttachToChat, id: 'terminal.attachToChat', label: labelAttachToChat, enabled: true,
             run: async () => {
@@ -513,14 +513,14 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         quickPick.hideInput = true;
         quickPick.hideCheckAll = true;
         quickPick.canSelectMany = true;
-        quickPick.title = ( localize(11660, 'Toggle visibility'));
+        quickPick.title = ( localize(11690, 'Toggle visibility'));
         const configValue = this._configurationService.getValue(TerminalSettingId.ShellIntegrationDecorationsEnabled);
         const gutterIcon = {
-            label: ( localize(11661, 'Gutter command decorations')),
+            label: ( localize(11691, 'Gutter command decorations')),
             picked: configValue !== 'never' && configValue !== 'overviewRuler'
         };
         const overviewRulerIcon = {
-            label: ( localize(11662, 'Overview ruler command decorations')),
+            label: ( localize(11692, 'Overview ruler command decorations')),
             picked: configValue !== 'never' && configValue !== 'gutter'
         };
         quickPick.items = [gutterIcon, overviewRulerIcon];

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js

@@ -281,9 +281,6 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                                 element.classList.add('bottom');
                             }
                         }
-                        if (this._terminal?.element) {
-                            element.style.marginLeft = `-${getWindow(this._terminal.element).getComputedStyle(this._terminal.element).paddingLeft}`;
-                        }
                     }));
                 }
             }

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

@@ -75,6 +75,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     private _searchAddon?;
     private _unicode11Addon?;
     private _webglAddon?;
+    private _webglAddonCustomGlyphs?;
     private _serializeAddon?;
     private _imageAddon?;
     private readonly _ligaturesAddon;
@@ -105,6 +106,10 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
         resultIndex: number;
         resultCount: number;
     }>;
+    private readonly _onBeforeSearch;
+    readonly onBeforeSearch: Event<void>;
+    private readonly _onAfterSearch;
+    readonly onAfterSearch: Event<void>;
     private readonly _onDidChangeSelection;
     readonly onDidChangeSelection: Event<void>;
     private readonly _onDidChangeFocus;

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js

@@ -102,6 +102,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._accessibilitySignalService = _accessibilitySignalService;
         this._isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
         this._progressState = { state: 0, value: 0 };
+        this._webglAddonCustomGlyphs = false;
         this._ligaturesAddon = this._register(( new MutableDisposable()));
         this._attachedDisposables = this._register(( new DisposableStore()));
         this._onDidRequestRunCommand = this._register(( new Emitter()));
@@ -112,6 +113,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.onDidRequestRefreshDimensions = this._onDidRequestRefreshDimensions.event;
         this._onDidChangeFindResults = this._register(( new Emitter()));
         this.onDidChangeFindResults = this._onDidChangeFindResults.event;
+        this._onBeforeSearch = this._register(( new Emitter()));
+        this.onBeforeSearch = this._onBeforeSearch.event;
+        this._onAfterSearch = this._register(( new Emitter()));
+        this.onAfterSearch = this._onAfterSearch.event;
         this._onDidChangeSelection = this._register(( new Emitter()));
         this.onDidChangeSelection = this._onDidChangeSelection.event;
         this._onDidChangeFocus = this._register(( new Emitter()));
@@ -152,7 +157,6 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             macOptionIsMeta: config.macOptionIsMeta,
             macOptionClickForcesSelection: config.macOptionClickForcesSelection,
             rightClickSelectsWord: config.rightClickBehavior === 'selectWord',
-            fastScrollModifier: 'alt',
             fastScrollSensitivity: config.fastScrollSensitivity,
             scrollSensitivity: config.mouseWheelScrollSensitivity,
             scrollOnEraseInDisplay: true,
@@ -426,7 +430,6 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.raw.options.macOptionClickForcesSelection = config.macOptionClickForcesSelection;
         this.raw.options.rightClickSelectsWord = config.rightClickBehavior === 'selectWord';
         this.raw.options.wordSeparator = config.wordSeparators;
-        this.raw.options.customGlyphs = config.customGlyphs;
         this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode;
         this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs;
         this._updateSmoothScrolling();
@@ -495,6 +498,12 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                     this._lastFindResult = results;
                     this._onDidChangeFindResults.fire(results);
                 });
+                this._searchAddon.onBeforeSearch(() => {
+                    this._onBeforeSearch.fire();
+                });
+                this._searchAddon.onAfterSearch(() => {
+                    this._onAfterSearch.fire();
+                });
                 return this._searchAddon;
             });
         }
@@ -617,7 +626,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             }
         }
         else {
-            this._notificationService.warn(( localize(11673, 'The terminal has no selection to copy')));
+            this._notificationService.warn(( localize(11703, 'The terminal has no selection to copy')));
         }
     }
     _setCursorBlink(blink) {
@@ -644,11 +653,15 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
     }
     async _enableWebglRenderer() {
-        if (!this.raw.element || this._webglAddon) {
+        if (!this.raw.element || this._webglAddon && this._webglAddonCustomGlyphs === this._terminalConfigurationService.config.customGlyphs) {
             return;
         }
+        this._disposeOfWebglRenderer();
+        this._webglAddonCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
         const Addon = await this._xtermAddonLoader.importAddon('webgl');
-        this._webglAddon = ( new Addon());
+        this._webglAddon = ( new Addon({
+            customGlyphs: this._terminalConfigurationService.config.customGlyphs
+        }));
         try {
             this.raw.loadAddon(this._webglAddon);
             this._logService.trace('Webgl was loaded');
@@ -718,12 +731,16 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
     }
     _disposeOfWebglRenderer() {
+        if (!this._webglAddon) {
+            return;
+        }
         try {
             this._webglAddon?.dispose();
         }
         catch {
         }
         this._webglAddon = undefined;
+        this._webglAddonCustomGlyphs = undefined;
         this._refreshImageAddon();
         this._onDidRequestRefreshDimensions.fire();
     }
@@ -811,6 +828,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     dispose() {
         this._anyTerminalFocusContextKey.reset();
         this._anyFocusedTerminalHasSelection.reset();
+        this._disposeOfWebglRenderer();
         this._onDidDispose.fire();
         super.dispose();
     }