@codingame/monaco-vscode-api 9.0.0 → 9.0.2

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -22,8 +22,8 @@ import { IChatService } from '../../chat/common/chatService.service.js';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from '../../chat/common/chatContextKeys.js';
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const LOCALIZED_START_INLINE_CHAT_STRING = ( localize2(7146, 'Start in Editor'));
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7147, 'Icon which spawns the inline chat from the editor toolbar.')));
+const LOCALIZED_START_INLINE_CHAT_STRING = ( localize2(7182, 'Start in Editor'));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7183, 'Icon which spawns the inline chat from the editor toolbar.')));
 class StartSessionAction extends EditorAction2 {
     constructor() {
         super({
@@ -58,7 +58,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(7148, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(7184, "Resume Last Dismissed Inline Chat")),
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable))),
             keybinding: {
@@ -81,7 +81,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInlineChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7149, "Inline Chat")); }
+    static { this.category = ( localize2(7185, "Inline Chat")); }
     constructor(desc) {
         super({
             ...desc,
@@ -127,7 +127,7 @@ class ArrowOutUpAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(7150, 'Cursor Up')),
+            title: ( localize(7186, 'Cursor Up')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -148,7 +148,7 @@ class ArrowOutDownAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(7151, 'Cursor Down')),
+            title: ( localize(7187, 'Cursor Down')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_LAST,
@@ -169,7 +169,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(7152, "Focus Input")),
+            title: ( localize2(7188, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(
@@ -203,7 +203,7 @@ class DiscardAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discard',
-            title: ( localize(7153, 'Discard')),
+            title: ( localize(7189, 'Discard')),
             icon: Codicon.discard,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -221,8 +221,8 @@ class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(7154, "Accept Changes")),
-            shortTitle: ( localize(7155, 'Accept')),
+            title: ( localize2(7190, "Accept Changes")),
+            shortTitle: ( localize(7191, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE,  (ContextKeyExpr.or(
@@ -257,7 +257,7 @@ class DiscardHunkAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(7153, 'Discard')),
+            title: ( localize(7189, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -290,8 +290,8 @@ class RerunAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(7156, "Rerun Request")),
-            shortTitle: ( localize(7157, 'Rerun')),
+            title: ( localize2(7192, "Rerun Request")),
+            shortTitle: ( localize(7193, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -324,7 +324,7 @@ class CloseAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(7158, 'Close')),
+            title: ( localize(7194, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -357,7 +357,7 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(7159, 'Configure Inline Chat')),
+            title: ( localize2(7195, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -376,7 +376,7 @@ class MoveToNextHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(7160, 'Move to Next Change')),
+            title: ( localize2(7196, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -393,7 +393,7 @@ class MoveToPreviousHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(7161, 'Move to Previous Change')),
+            title: ( localize2(7197, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -410,7 +410,7 @@ class ViewInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(7162, 'View in Chat')),
+            title: ( localize(7198, 'View in Chat')),
             icon: Codicon.commentDiscussion,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -448,7 +448,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                  (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
                 CTX_INLINE_CHAT_CHANGE_HAS_DIFF
             ))),
-            title: ( localize2(7163, 'Toggle Changes')),
+            title: ( localize2(7199, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js

@@ -248,14 +248,14 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(options.headless ?? session?.headless, true, initPosition);
-        let errorMessage = ( localize(7036, "Failed to start editor chat"));
+        let errorMessage = ( localize(7072, "Failed to start editor chat"));
         if (!session) {
             const createSessionCts = ( (new CancellationTokenSource()));
             const msgListener = Event.once(this._messages.event)(m => {
                 this._log('state=_createSession) message received', m);
                 if (m === Message.ACCEPT_INPUT) {
                     options.autoSend = true;
-                    this._ui.value.zone.widget.updateInfo(( localize(7037, "Getting ready...")));
+                    this._ui.value.zone.widget.updateInfo(( localize(7073, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -575,7 +575,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         let newPosition;
         if (response.result?.errorDetails) ;
         else if (response.response.value.length === 0) {
-            const status = ( localize(7038, "No results, please refine your input and try again"));
+            const status = ( localize(7074, "No results, please refine your input and try again"));
             this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
         }
         else {
@@ -609,7 +609,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localize(7039, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(7075, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -629,7 +629,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localize(7040, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(7076, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -762,7 +762,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         if (!this._session) {
             return;
         }
-        const status = ( localize(7041, "Accept or discard changes to continue saving."));
+        const status = ( localize(7077, "Accept or discard changes to continue saving."));
         this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
         if (this._ui.value.zone.position) {
             this._editor.revealLineInCenterIfOutsideViewport(this._ui.value.zone.position.lineNumber);

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js

@@ -180,7 +180,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10627, 'Closed inline chat widget')));
+        status(( localize(10639, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -34,7 +34,7 @@ var EditMode;
     properties: {
         [InlineChatConfigKeys.Mode]: {
             description: ( localize(
-                6994,
+                7030,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: EditMode.Live,
@@ -42,11 +42,11 @@ var EditMode;
             enum: [EditMode.Live, EditMode.Preview],
             markdownEnumDescriptions: [
                 ( localize(
-                    6995,
+                    7031,
                     "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
                 ( localize(
-                    6996,
+                    7032,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -54,20 +54,20 @@ var EditMode;
         },
         [InlineChatConfigKeys.FinishOnType]: {
             description: ( localize(
-                6997,
+                7033,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localize(6998, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(7034, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.HoldToSpeech]: {
             description: ( localize(
-                6999,
+                7035,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -75,7 +75,7 @@ var EditMode;
         },
         [InlineChatConfigKeys.AccessibleDiffView]: {
             description: ( localize(
-                7000,
+                7036,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -83,16 +83,16 @@ var EditMode;
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localize(
-                    7001,
+                    7037,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localize(7002, "The accessible diff viewer is always enabled.")),
-                ( localize(7003, "The accessible diff viewer is never enabled.")),
+                ( localize(7038, "The accessible diff viewer is always enabled.")),
+                ( localize(7039, "The accessible diff viewer is never enabled.")),
             ],
         },
         [InlineChatConfigKeys.StartWithOverlayWidget]: {
             description: ( localize(
-                7004,
+                7040,
                 "Whether inline chat opens directly as zone widget, between the lines, or as overlay widget which turns into a zone."
             )),
             default: false,
@@ -100,7 +100,7 @@ var EditMode;
         },
         [InlineChatConfigKeys.ZoneToolbar]: {
             description: ( localize(
-                7005,
+                7041,
                 "Whether to show a toolbar to accept or reject changes in the inline chat changes view."
             )),
             default: false,
@@ -116,36 +116,36 @@ var InlineChatResponseType;
     InlineChatResponseType["Messages"] = "messages";
     InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
 })(InlineChatResponseType || (InlineChatResponseType = {}))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7006, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7007, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7008, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7042, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7043, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7044, "Whether the interactive editor input is focused")))));
 const CTX_INLINE_CHAT_EDITING = ( (new RawContextKey('inlineChatEditing', true, ( localize(
-    7009,
+    7045,
     "Whether the user is currently editing or generating code in the inline chat"
 )))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7010, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7011, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7046, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7047, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7012,
+    7048,
     "Whether the cursor of the iteractive editor input is on the first line"
 )))));
 const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localize(
-    7013,
+    7049,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7016,
+    7052,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 )))));
-const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7017, "Whether interactive editor has kept a session for quick restore")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7018, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7019, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7020, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7021, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7053, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7054, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7055, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7056, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7057, "Whether the current change showing a diff")))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7022, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7058, "Whether an inline chat request is currently in progress")))));
 const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localize(
-    7023,
+    7059,
     "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
 )))));
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
@@ -158,17 +158,17 @@ const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
 const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
 const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
-const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7024, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7025, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localize(7026, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localize(7027, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7028, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7029, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7030, "Foreground color of the interactive editor input placeholder")));
-registerColor('inlineChatInput.background', inputBackground, ( localize(7031, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7032, "Background color of inserted text in the interactive editor input")));
-const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7033, 'Overview ruler marker color for inline chat inserted content.')));
-const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7033, 'Overview ruler marker color for inline chat inserted content.')));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7034, "Background color of removed text in the interactive editor input")));
-registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7035, 'Overview ruler marker color for inline chat removed content.')));
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7060, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7061, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7062, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7063, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7064, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7065, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7066, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7067, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7068, "Background color of inserted text in the interactive editor input")));
+const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7069, 'Overview ruler marker color for inline chat inserted content.')));
+const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7069, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7070, "Background color of removed text in the interactive editor input")));
+registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7071, 'Overview ruler marker color for inline chat removed content.')));
 export { ACTION_ACCEPT_CHANGES, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js

@@ -9,8 +9,8 @@ class ListResizeColumnAction extends Action2 {
     constructor() {
         super({
             id: 'list.resizeColumn',
-            title: { value: ( localize(4609, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(4610, "List")), original: 'List' },
+            title: { value: ( localize(4501, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(4502, "List")), original: 'List' },
             precondition: WorkbenchListFocusContextKey,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js

@@ -15,14 +15,14 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
                 items.push({ label, index });
             }
         });
-        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9838, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9822, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(9839, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(9823, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                9840,
+                9824,
                 "Please enter a width in percentage for the '{0}' column.",
                 column.label
             )),
@@ -37,11 +37,11 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
     async _validateColumnResizeValue(input) {
         const percentage = Number.parseInt(input);
         if (input && !Number.isInteger(percentage)) {
-            return ( localize(9841, "Please enter an integer."));
+            return ( localize(9825, "Please enter an integer."));
         }
         else if (percentage < 0 || percentage > 100) {
             return ( localize(
-                9842,
+                9826,
                 "Please enter a number greater than 0 and less than or equal to 100."
             ));
         }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -73,7 +73,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localize(8025, "Merging: {0}", super.getName()));
+        return ( localize(7665, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -108,12 +108,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10701,
+                10670,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10702,
+                10671,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -121,12 +121,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10703, "&&Save With Conflicts")) :
-                        ( localize(10704, "&&Save")),
+                        ( localize(10672, "&&Save With Conflicts")) :
+                        ( localize(10673, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(10705, "Do&&n't Save")),
+                    label: ( localize(10674, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ];
@@ -136,16 +136,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10706,
+                    10675,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10707,
+                    10676,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10708, "The merge results will be lost if you don't save them."))
-                        : ( localize(10709, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10677, "The merge results will be lost if you don't save them."))
+                        : ( localize(10678, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -170,12 +170,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10710, "Do you want to accept the merge result?")),
+                message: ( localize(10679, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10711,
+                    10680,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10712, '&&Accept Merge'))
+                primaryButton: ( localize(10681, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -200,7 +200,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10713, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10682, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -310,12 +310,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10714,
+                10683,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10715,
+                10684,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -325,25 +325,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10716,
+                        10685,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10717,
+                        10686,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10718, "Your changes will be lost if you don't save them."))
-                        : ( localize(10719, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10687, "Your changes will be lost if you don't save them."))
+                        : ( localize(10688, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10720, '&&Save with Conflicts'))
-                            : ( localize(10721, '&&Save')),
+                            ? ( localize(10689, '&&Save with Conflicts'))
+                            : ( localize(10690, '&&Save')),
                         run: () => ConfirmResult.SAVE
                     },
                     {
-                        label: ( localize(10722, "Do&&n't Save")),
+                        label: ( localize(10691, "Do&&n't Save")),
                         run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
@@ -356,21 +356,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10723, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10692, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10724,
+                    10693,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10725, "The files contain unhandled conflicts."))
-                        : ( localize(10726, "The file contains unhandled conflicts."))
+                        ? ( localize(10694, "The files contain unhandled conflicts."))
+                        : ( localize(10695, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10727, '&&Close with Conflicts'))
-                    : ( localize(10728, '&&Close')),
-                checkbox: { label: ( localize(10729, "Do not ask me again")) }
+                    ? ( localize(10696, '&&Close with Conflicts'))
+                    : ( localize(10697, '&&Close')),
+                checkbox: { label: ( localize(10698, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,32 +1,32 @@
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10843, 'The editor is a merge editor')) })));
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10884, 'The editor is a merge editor')) })));
 const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localize(10844, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(10885, 'The editor is a the result editor of a merge editor.')) }
 )));
 const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localize(10845, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(10886, 'The layout mode of a merge editor')) }
 )));
 const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localize(10846, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(10887, 'If the merge editor shows the base version')) }
 )));
 const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localize(10847, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(10888, 'If base should be shown at the top')) }
 )));
 const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localize(10848, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(10889, 'If the merge editor shows non-conflicting changes')) }
 )));
-const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10849, 'The uri of the baser of a merge editor')) })));
-const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10850, 'The uri of the result of a merge editor')) })));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10890, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10891, 'The uri of the result of a merge editor')) })));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };