@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -1,12 +1,12 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
-import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { focusBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
-import { editorWidgetBackground, editorWidgetBorder, widgetShadow, editorHoverHighlight, diffInserted, diffRemoved } from '../../../../platform/theme/common/colors/editorColors.js';
+import { editorWidgetForeground, editorWidgetBackground, editorWidgetBorder, widgetShadow, diffInserted, diffRemoved } from '../../../../platform/theme/common/colors/editorColors.js';
 import { inputPlaceholderForeground, inputBackground } from '../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
@@ -14,104 +14,7 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { Extensions } from '../../../common/configuration.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/common/inlineChat";
-var InlineChatResponseTypes;
-( ((function(InlineChatResponseTypes) {
-    InlineChatResponseTypes["Empty"] = "empty";
-    InlineChatResponseTypes["OnlyEdits"] = "onlyEdits";
-    InlineChatResponseTypes["OnlyMessages"] = "onlyMessages";
-    InlineChatResponseTypes["Mixed"] = "mixed";
-})(InlineChatResponseTypes || (InlineChatResponseTypes = {}))));
-const INLINE_CHAT_ID = 'interactiveEditor';
-var EditMode;
-( ((function(EditMode) {
-    EditMode["Live"] = "live";
-    EditMode["Preview"] = "preview";
-})(EditMode || (EditMode = {}))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 0, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localizeWithPath(_moduleId, 1, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localizeWithPath(_moduleId, 2, "Whether the interactive editor input is focused")))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(_moduleId, 3, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localizeWithPath(_moduleId, 4, "Whether the interactive editor input is empty")))));
-const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localizeWithPath(
-    _moduleId,
-    5,
-    "Whether the cursor of the iteractive editor input is on the first line"
-)))));
-const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localizeWithPath(
-    _moduleId,
-    6,
-    "Whether the cursor of the iteractive editor input is on the last line"
-)))));
-const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
-    _moduleId,
-    9,
-    "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, ( localizeWithPath(
-    _moduleId,
-    10,
-    "Whether interactive editor has kept a session for quick restore"
-)))));
-const CTX_INLINE_CHAT_RESPONSE_TYPES = ( (new RawContextKey('inlineChatResponseTypes', InlineChatResponseTypes.Empty, ( localizeWithPath(_moduleId, 11, "What type was the responses have been receieved")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 12, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 13, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 14, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 15, "Whether the current change showing a diff")))));
-const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
-const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
-const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
-const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
-const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
-const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
-const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 16, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 17, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localizeWithPath(_moduleId, 18, "Shadow color of the interactive editor widget")));
-registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localizeWithPath(
-    _moduleId,
-    19,
-    "Background highlighting of the current interactive region. Must be transparent."
-)), true);
-registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 20, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, ( localizeWithPath(_moduleId, 21, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', { dark: inputPlaceholderForeground, light: inputPlaceholderForeground, hcDark: inputPlaceholderForeground, hcLight: inputPlaceholderForeground }, ( localizeWithPath(
-    _moduleId,
-    22,
-    "Foreground color of the interactive editor input placeholder"
-)));
-registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 23, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', { dark: ( (transparent(diffInserted, .5))), light: ( (transparent(diffInserted, .5))), hcDark: ( (transparent(diffInserted, .5))), hcLight: ( (transparent(diffInserted, .5))) }, ( localizeWithPath(
-    _moduleId,
-    24,
-    "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))) }, ( localizeWithPath(
-    _moduleId,
-    25,
-    '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))) }, ( localizeWithPath(
-    _moduleId,
-    25,
-    'Overview ruler marker color for inline chat inserted content.'
-)));
-registerColor('inlineChatDiff.removed', { dark: ( (transparent(diffRemoved, .5))), light: ( (transparent(diffRemoved, .5))), hcDark: ( (transparent(diffRemoved, .5))), hcLight: ( (transparent(diffRemoved, .5))) }, ( localizeWithPath(
-    _moduleId,
-    26,
-    "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))) }, ( localizeWithPath(
-    _moduleId,
-    27,
-    'Overview ruler marker color for inline chat removed content.'
-)));
-( (Registry.as(Extensions.ConfigurationMigration))).registerConfigurationMigrations([{
-        key: 'interactiveEditor.editMode', migrateFn: (value) => {
-            return [['inlineChat.mode', { value: value }]];
-        }
-    }]);
 var InlineChatConfigKeys;
 ( ((function(InlineChatConfigKeys) {
     InlineChatConfigKeys["Mode"] = "inlineChat.mode";
@@ -119,14 +22,20 @@ var InlineChatConfigKeys;
     InlineChatConfigKeys["AcceptedOrDiscardBeforeSave"] = "inlineChat.acceptedOrDiscardBeforeSave";
     InlineChatConfigKeys["HoldToSpeech"] = "inlineChat.holdToSpeech";
     InlineChatConfigKeys["AccessibleDiffView"] = "inlineChat.accessibleDiffView";
+    InlineChatConfigKeys["ExpTextButtons"] = "inlineChat.experimental.textButtons";
 })(InlineChatConfigKeys || (InlineChatConfigKeys = {}))));
-( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
+var EditMode;
+( ((function(EditMode) {
+    EditMode["Live"] = "live";
+    EditMode["Preview"] = "preview";
+})(EditMode || (EditMode = {}))));
+( (Registry.as(Extensions.Configuration))).registerConfiguration({
     id: 'editor',
     properties: {
         [InlineChatConfigKeys.Mode]: {
             description: ( localizeWithPath(
                 _moduleId,
-                28,
+                0,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: EditMode.Live,
@@ -135,12 +44,12 @@ var InlineChatConfigKeys;
             markdownEnumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    29,
+                    1,
                     "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."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    30,
+                    2,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -149,21 +58,21 @@ var InlineChatConfigKeys;
         [InlineChatConfigKeys.FinishOnType]: {
             description: ( localizeWithPath(
                 _moduleId,
-                31,
+                3,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localizeWithPath(_moduleId, 32, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localizeWithPath(_moduleId, 4, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.HoldToSpeech]: {
             description: ( localizeWithPath(
                 _moduleId,
-                33,
+                5,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -172,7 +81,7 @@ var InlineChatConfigKeys;
         [InlineChatConfigKeys.AccessibleDiffView]: {
             description: ( localizeWithPath(
                 _moduleId,
-                34,
+                6,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -181,13 +90,107 @@ var InlineChatConfigKeys;
             markdownEnumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    35,
+                    7,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localizeWithPath(_moduleId, 36, "The accessible diff viewer is always enabled.")),
-                ( localizeWithPath(_moduleId, 37, "The accessible diff viewer is never enabled.")),
+                ( localizeWithPath(_moduleId, 8, "The accessible diff viewer is always enabled.")),
+                ( localizeWithPath(_moduleId, 9, "The accessible diff viewer is never enabled.")),
             ],
-        }
+        },
+        [InlineChatConfigKeys.ExpTextButtons]: {
+            description: ( localizeWithPath(_moduleId, 10, "Whether to use textual buttons.")),
+            default: false,
+            type: 'boolean',
+            tags: ['experimental']
+        },
     }
 });
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, 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_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_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseTypes, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };
+const INLINE_CHAT_ID = 'interactiveEditor';
+var InlineChatResponseType;
+( ((function(InlineChatResponseType) {
+    InlineChatResponseType["None"] = "none";
+    InlineChatResponseType["Messages"] = "messages";
+    InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
+})(InlineChatResponseType || (InlineChatResponseType = {}))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 11, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localizeWithPath(_moduleId, 12, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localizeWithPath(_moduleId, 13, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(_moduleId, 14, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localizeWithPath(_moduleId, 15, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localizeWithPath(
+    _moduleId,
+    16,
+    "Whether the cursor of the iteractive editor input is on the first line"
+)))));
+const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localizeWithPath(
+    _moduleId,
+    17,
+    "Whether the cursor of the iteractive editor input is on the last line"
+)))));
+const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
+    _moduleId,
+    20,
+    "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, ( localizeWithPath(
+    _moduleId,
+    21,
+    "Whether interactive editor has kept a session for quick restore"
+)))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 22, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 23, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 24, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 25, "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, ( localizeWithPath(_moduleId, 26, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localizeWithPath(
+    _moduleId,
+    27,
+    "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
+)))));
+const CTX_INLINE_CHAT_CONFIG_TXT_BTNS = ( (ContextKeyExpr.equals(`config.${[InlineChatConfigKeys.ExpTextButtons]}`, true)));
+const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
+const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
+const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
+const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
+const MENU_INLINE_CHAT_EXECUTE = MenuId.for('inlineChat.execute');
+const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
+const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localizeWithPath(_moduleId, 28, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localizeWithPath(_moduleId, 29, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localizeWithPath(_moduleId, 30, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localizeWithPath(_moduleId, 31, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localizeWithPath(_moduleId, 32, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localizeWithPath(_moduleId, 33, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localizeWithPath(
+    _moduleId,
+    34,
+    "Foreground color of the interactive editor input placeholder"
+)));
+registerColor('inlineChatInput.background', inputBackground, ( localizeWithPath(_moduleId, 35, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localizeWithPath(
+    _moduleId,
+    36,
+    "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))) }, ( localizeWithPath(
+    _moduleId,
+    37,
+    '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))) }, ( localizeWithPath(
+    _moduleId,
+    37,
+    'Overview ruler marker color for inline chat inserted content.'
+)));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localizeWithPath(
+    _moduleId,
+    38,
+    "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))) }, ( localizeWithPath(
+    _moduleId,
+    39,
+    'Overview ruler marker color for inline chat removed content.'
+)));
+export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_CONFIG_TXT_BTNS, CTX_INLINE_CHAT_DOCUMENT_CHANGED, 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_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -23,7 +23,7 @@ img {
 }
 
 a {
-	text-decoration: none;
+	text-decoration: var(--text-link-decoration);
 }
 
 a:hover {
@@ -171,7 +171,7 @@ function sanitize(documentContent, allowUnknownProtocols) {
         hook.dispose();
     }
 }
-async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token, settingRenderer) {
+async function renderMarkdownDocument(text, extensionService, languageService, options) {
     const highlight = (code, lang, callback) => {
         if (!callback) {
             return code;
@@ -181,7 +181,7 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
             return '';
         }
         extensionService.whenInstalledExtensionsRegistered().then(async () => {
-            if (token?.isCancellationRequested) {
+            if (options?.token?.isCancellationRequested) {
                 callback(null, '');
                 return;
             }
@@ -191,15 +191,11 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
         });
         return '';
     };
-    const renderer = new marked_1.Renderer();
-    if (settingRenderer) {
-        renderer.html = settingRenderer.getHtmlRenderer();
-    }
     return ( new Promise((resolve, reject) => {
-        marked_1(text, { highlight, renderer }, (err, value) => err ? reject(err) : resolve(value));
+        marked_1(text, { highlight, renderer: options?.renderer }, (err, value) => err ? reject(err) : resolve(value));
     })).then(raw => {
-        if (shouldSanitize) {
-            return sanitize(raw, allowUnknownProtocols);
+        if (options?.shouldSanitize ?? true) {
+            return sanitize(raw, options?.allowUnknownProtocols ?? false);
         }
         else {
             return raw;

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

@@ -77,7 +77,7 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         this.dialogService = dialogService;
         this.editorService = editorService;
         this.savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
-        this.altVersionId = observableFromEvent(e => this.model.resultTextModel.onDidChangeContent(e), () =>
+        this.altVersionId = observableFromEvent(this, e => this.model.resultTextModel.onDidChangeContent(e), () =>
          this.model.resultTextModel.getAlternativeVersionId());
         this.isDirty = derived(this, (reader) => this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
         this.finished = false;
@@ -257,7 +257,7 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         this.telemetry = telemetry;
         this._dialogService = _dialogService;
         this._storageService = _storageService;
-        this.isDirty = observableFromEvent(Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError), () =>  this.resultTextFileModel.isDirty());
+        this.isDirty = observableFromEvent(this, Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError), () =>  this.resultTextFileModel.isDirty());
         this.reported = false;
         this.dateTimeOpened = ( (new Date()));
     }

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -11,6 +11,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromValueWithChangeEvent, constObservable, mapObservableArrayCached, recomputeInitiallyAndOnChange, ValueWithChangeEventFromObservable, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { ObservableLazyPromise } from '../../../../base/common/observableInternal/promise.js';
+import '../../../../base/common/arrays.js';
 import { isDefined, isObject } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ConstLazyPromise } from '../../../../editor/browser/widget/multiDiffEditor/model.js';

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -54,8 +54,8 @@ let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
     }
     async resolveDiffSource(uri) {
         const { repositoryUri, groupId } = ScmMultiDiffSourceResolver_1.parseUri(uri);
-        const repository = await waitForState(observableFromEvent(this._scmService.onDidAddRepository, () => [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( (repositoryUri.toString())))));
-        const group = await waitForState(observableFromEvent(repository.provider.onDidChangeResourceGroups, () => repository.provider.groups.find(g => g.id === groupId)));
+        const repository = await waitForState(observableFromEvent(this, this._scmService.onDidAddRepository, () => [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( (repositoryUri.toString())))));
+        const group = await waitForState(observableFromEvent(this, repository.provider.onDidChangeResourceGroups, () => repository.provider.groups.find(g => g.id === groupId)));
         return (
              (new ScmResolvedMultiDiffSource(group, repository))
         );

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.js

@@ -1,5 +1,6 @@
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { NotebookFindScopeType } from '../../../common/notebookCommon.js';
 class NotebookFindFilters extends Disposable {
     get markupInput() {
         return this._markupInput;
@@ -37,25 +38,16 @@ class NotebookFindFilters extends Disposable {
             this._onDidChange.fire({ codeOutput: value });
         }
     }
-    get searchInRanges() {
-        return this._searchInRanges;
-    }
-    set searchInRanges(value) {
-        if (this._searchInRanges !== value) {
-            this._searchInRanges = value;
-            this._onDidChange.fire({ searchInRanges: value });
-        }
-    }
-    get selectedRanges() {
-        return this._selectedRanges;
+    get findScope() {
+        return this._findScope;
     }
-    set selectedRanges(value) {
-        if (this._selectedRanges !== value) {
-            this._selectedRanges = value;
-            this._onDidChange.fire({ searchInRanges: this._searchInRanges });
+    set findScope(value) {
+        if (this._findScope !== value) {
+            this._findScope = value;
+            this._onDidChange.fire({ findScope: true });
         }
     }
-    constructor(markupInput, markupPreview, codeInput, codeOutput, searchInRanges, selectedRanges) {
+    constructor(markupInput, markupPreview, codeInput, codeOutput, findScope) {
         super();
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
@@ -63,14 +55,12 @@ class NotebookFindFilters extends Disposable {
         this._markupPreview = true;
         this._codeInput = true;
         this._codeOutput = true;
-        this._searchInRanges = false;
-        this._selectedRanges = [];
+        this._findScope = { findScopeType: NotebookFindScopeType.None };
         this._markupInput = markupInput;
         this._markupPreview = markupPreview;
         this._codeInput = codeInput;
         this._codeOutput = codeOutput;
-        this._searchInRanges = searchInRanges;
-        this._selectedRanges = selectedRanges;
+        this._findScope = findScope;
         this._initialMarkupInput = markupInput;
         this._initialMarkupPreview = markupPreview;
         this._initialCodeInput = codeInput;
@@ -87,8 +77,7 @@ class NotebookFindFilters extends Disposable {
         this._markupPreview = v.markupPreview;
         this._codeInput = v.codeInput;
         this._codeOutput = v.codeOutput;
-        this._searchInRanges = v.searchInRanges;
-        this._selectedRanges = v.selectedRanges;
+        this._findScope = v.findScope;
     }
 }
 export { NotebookFindFilters };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.js

@@ -46,7 +46,6 @@ class FindMatchDecorationModel extends Disposable {
             };
         });
         this._currentMatchCellDecorations = this._notebookEditor.deltaCellDecorations(this._currentMatchCellDecorations, [{
-                ownerId: cell.handle,
                 handle: cell.handle,
                 options: {
                     overviewRuler: {
@@ -64,7 +63,6 @@ class FindMatchDecorationModel extends Disposable {
         const offset = await this._notebookEditor.findHighlightCurrent(index, this.ownerID);
         this._currentMatchDecorations = { kind: 'output', index: index };
         this._currentMatchCellDecorations = this._notebookEditor.deltaCellDecorations(this._currentMatchCellDecorations, [{
-                ownerId: cell.handle,
                 handle: cell.handle,
                 options: {
                     overviewRuler: {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { findFirstIdxMonotonousOrArrLen } from '../../../../../../base/common/arraysFind.js';
 import { Delayer, createCancelablePromise } from '../../../../../../base/common/async.js';
-import { CellEditState } from '../../notebookBrowser.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
-import { CellKind, NotebookCellsChangeType } from '../../../common/notebookCommon.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
-import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { findFirstIdxMonotonousOrArrLen } from '../../../../../../base/common/arraysFind.js';
 import { FindMatchDecorationModel } from './findMatchDecorationModel.js';
+import { CellEditState } from '../../notebookBrowser.js';
+import { CellKind, NotebookCellsChangeType } from '../../../common/notebookCommon.js';
 class CellFindMatchModel {
     get length() {
         return this._contentMatches.length + this._webviewMatches.length;
@@ -76,7 +76,7 @@ let FindModel = class FindModel extends Disposable {
         this._findMatchDecorationModel = ( new FindMatchDecorationModel(this._notebookEditor, this._notebookEditor.getId()));
     }
     _updateCellStates(e) {
-        if (!this._state.filters?.markupInput || !this._state.filters?.markupPreview || !this._state.filters?.searchInRanges || !this._state.filters?.selectedRanges) {
+        if (!this._state.filters?.markupInput || !this._state.filters?.markupPreview || !this._state.filters?.findScope) {
             return;
         }
         const updateEditingState = () => {
@@ -94,8 +94,7 @@ let FindModel = class FindModel extends Disposable {
                 includeCodeInput: false,
                 includeMarkupPreview: false,
                 includeOutput: false,
-                searchInRanges: this._state.filters?.searchInRanges,
-                selectedRanges: this._state.filters?.selectedRanges
+                findScope: this._state.filters?.findScope,
             };
             const contentMatches = viewModel.find(this._state.searchString, options);
             for (let i = 0; i < viewModel.length; i++) {
@@ -356,8 +355,7 @@ let FindModel = class FindModel extends Disposable {
             includeCodeInput: this._state.filters?.codeInput ?? true,
             includeMarkupPreview: !!this._state.filters?.markupPreview,
             includeOutput: !!this._state.filters?.codeOutput,
-            searchInRanges: this._state.filters?.searchInRanges,
-            selectedRanges: this._state.filters?.selectedRanges
+            findScope: this._state.filters?.findScope,
         };
         ret = await this._notebookEditor.find(val, options, token);
         if (token.isCancellationRequested) {