@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

@@ -2,21 +2,18 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { addDisposableListener, Dimension } from '../../../../base/browser/dom.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../base/common/resources.js';
 import { assertType } from '../../../../base/common/types.js';
-import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
 import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_SECONDARY, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
-import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
-import { ScrollType } from '../../../../editor/common/editorCommon.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { isResponseVM } from '../../chat/common/chatViewModel.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../common/inlineChat.js';
+import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     constructor(location, editor, _instaService, _logService, contextKeyService, configurationService) {
         super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 50000 });
@@ -45,13 +42,12 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
             chatWidgetViewOptions: {
                 menus: {
-                    executeToolbar: MenuId.ChatExecute,
                     telemetrySource: 'interactiveEditorWidget-toolbar',
                 },
                 rendererOptions: {
                     renderTextEditsAsSummary: (uri) => {
                         return isEqual(uri, editor.getModel()?.uri)
-                            && configurationService.getValue(InlineChatConfigKeys.Mode) === EditMode.Live;
+                            && configurationService.getValue("inlineChat.mode" ) === "live" ;
                     },
                 }
             }
@@ -110,7 +106,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         const chatContentHeight = this.widget.contentHeight;
         const editorHeight = this.editor.getLayoutInfo().height;
         const contentHeight = Math.min(chatContentHeight, Math.max(this.widget.minHeight, editorHeight * 0.42));
-        const heightInLines = contentHeight / this.editor.getOption(EditorOption.lineHeight);
+        const heightInLines = contentHeight / this.editor.getOption(69 );
         return { linesValue: heightInLines, pixelsValue: contentHeight };
     }
     _onWidth(_widthInPixel) {
@@ -130,6 +126,13 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         revealZone();
         this._scrollUp.enable();
     }
+    reveal(position) {
+        const stickyScroll = this.editor.getOption(118 );
+        const magicValue = stickyScroll.enabled ? stickyScroll.maxLineCount : 0;
+        this.editor.revealLines(position.lineNumber + magicValue, position.lineNumber + magicValue, 1 );
+        this._scrollUp.reset();
+        this.updatePositionAndHeight(position);
+    }
     updatePositionAndHeight(position) {
         const revealZone = this._createZoneAndScrollRestoreFn(position);
         super.updatePositionAndHeight(position, this._computeHeight().linesValue);
@@ -164,7 +167,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             }
             if (newScrollTop < scrollTop || forceScrollTop) {
                 this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
-                this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
+                this.editor.setScrollTop(newScrollTop, 1 );
             }
         });
     }
@@ -180,7 +183,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10639, 'Closed inline chat widget')));
+        status(( localize(10260, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };
@@ -199,6 +202,9 @@ class ScrollUpState {
     dispose() {
         this._listener.dispose();
     }
+    reset() {
+        this._didScrollUpOrDown = undefined;
+    }
     enable() {
         this._didScrollUpOrDown = undefined;
         this._listener.value = this._editor.onDidScrollChange(e => {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:2px 6px 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups{margin:2px 0 0 4px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding-left:6px;padding-right:20px;padding-top:2px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{display:none;right:10px;top:5px}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding-left:6px;padding-right:6px;padding-top:6px}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto;padding-left:6px;padding-right:6px}.monaco-workbench .inline-chat .status .label.hidden,.monaco-workbench .inline-chat .status .label:empty{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 3px}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget .toolbar,.monaco-workbench .inline-chat-diff-overlay{display:flex;height:18px;.actions-container{gap:3px}.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-button.codicon{display:flex}.monaco-button.codicon:before{align-self:center;color:var(--vscode-button-foreground)}.monaco-button.secondary.codicon:before{align-self:center;color:var(--vscode-button-secondaryForeground)}.monaco-text-button{padding:0 2px;white-space:nowrap}}.monaco-workbench .inline-chat .status .actions{gap:4px}.monaco-workbench .inline-chat .status .actions.secondary{display:none}.monaco-workbench .inline-chat .status:focus-within .actions.secondary,.monaco-workbench .inline-chat .status:hover .actions.secondary,.monaco-workbench .inline-chat:focus .status .actions.secondary{display:inherit}.monaco-workbench .inline-chat-diff-overlay{.monaco-button{border-radius:0}.monaco-button.secondary.checked{background-color:var(--vscode-button-secondaryHoverBackground)}.monaco-button:first-child{border-bottom-left-radius:2px;border-top-left-radius:2px}.monaco-button:last-child{border-bottom-right-radius:2px;border-top-right-radius:2px}.monaco-button:not(:last-child){border-right:1px solid var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .diff-review{background-color:unset;padding:4px 6px}.monaco-workbench .inline-chat .diff-review.hidden{display:none}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit;padding-top:3px;position:relative}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:4px 8px 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-followups .interactive-session-followups{margin:2px 0 0 4px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .monaco-scrollable-element{border-top-left-radius:3px;border-top-right-radius:3px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .monaco-scrollable-element .shadow.top{box-shadow:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:8px;padding:3px 20px 3px 8px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{display:none;right:10px;top:5px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.chat-footer-toolbar{display:none}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding-left:8px;padding-right:8px;padding-top:8px}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto;padding-left:8px;padding-right:8px}.monaco-workbench .inline-chat .status .label.hidden,.monaco-workbench .inline-chat .status .label:empty{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 3px}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-diff-overlay{display:flex;height:18px;.actions-container{gap:3px}.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-button.codicon{display:flex}.monaco-button.codicon:before{align-self:center;color:var(--vscode-button-foreground)}.monaco-button.secondary.codicon:before{align-self:center;color:var(--vscode-button-secondaryForeground)}.monaco-text-button{font-size:12px;padding:0 6px;white-space:nowrap}}.monaco-workbench .inline-chat .status .actions{gap:4px}.monaco-workbench .inline-chat .status .actions.secondary{display:none}.monaco-workbench .inline-chat .status:focus-within .actions.secondary,.monaco-workbench .inline-chat .status:hover .actions.secondary,.monaco-workbench .inline-chat:focus .status .actions.secondary{display:inherit}.monaco-workbench .inline-chat-diff-overlay{.monaco-button{border-radius:0}.monaco-button.secondary.checked{background-color:var(--vscode-button-secondaryHoverBackground)}.monaco-button:first-child{border-bottom-left-radius:2px;border-top-left-radius:2px}.monaco-button:last-child{border-bottom-right-radius:2px;border-top-right-radius:2px}.monaco-button:not(:last-child){border-right:1px solid var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .diff-review{background-color:unset;padding:4px 6px}.monaco-workbench .inline-chat .diff-review.hidden{display:none}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };

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

@@ -1,5 +1,4 @@
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
-import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { AsyncIterableSource } from '../../../../base/common/async.js';
 import { getNWords } from '../../chat/common/chatWordCounter.js';
 async function performAsyncTextEdit(model, edit, progress, obs) {
@@ -7,7 +6,7 @@ async function performAsyncTextEdit(model, edit, progress, obs) {
             range: edit.range,
             options: {
                 description: 'asyncTextEdit',
-                stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
+                stickiness: 0
             }
         }]);
     let first = true;

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

@@ -14,68 +14,53 @@ 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';
-var InlineChatConfigKeys;
-( ((function(InlineChatConfigKeys) {
-    InlineChatConfigKeys["Mode"] = "inlineChat.mode";
-    InlineChatConfigKeys["FinishOnType"] = "inlineChat.finishOnType";
-    InlineChatConfigKeys["AcceptedOrDiscardBeforeSave"] = "inlineChat.acceptedOrDiscardBeforeSave";
-    InlineChatConfigKeys["StartWithOverlayWidget"] = "inlineChat.startWithOverlayWidget";
-    InlineChatConfigKeys["ZoneToolbar"] = "inlineChat.experimental.enableZoneToolbar";
-    InlineChatConfigKeys["HoldToSpeech"] = "inlineChat.holdToSpeech";
-    InlineChatConfigKeys["AccessibleDiffView"] = "inlineChat.accessibleDiffView";
-})(InlineChatConfigKeys || (InlineChatConfigKeys = {}))));
-var EditMode;
-( ((function(EditMode) {
-    EditMode["Live"] = "live";
-    EditMode["Preview"] = "preview";
-})(EditMode || (EditMode = {}))));
 ( (Registry.as(Extensions.Configuration))).registerConfiguration({
     id: 'editor',
     properties: {
-        [InlineChatConfigKeys.Mode]: {
+        ["inlineChat.mode" ]: {
             description: ( localize(
-                7030,
+                7202,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
-            default: EditMode.Live,
+            default: "live" ,
             type: 'string',
-            enum: [EditMode.Live, EditMode.Preview],
+            enum: ["live" , "preview" ],
             markdownEnumDescriptions: [
                 ( localize(
-                    7031,
+                    7203,
                     "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(
-                    7032,
+                    7204,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
             tags: ['experimental']
         },
-        [InlineChatConfigKeys.FinishOnType]: {
+        ["inlineChat.finishOnType" ]: {
             description: ( localize(
-                7033,
+                7205,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
-        [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localize(7034, "Whether pending inline chat sessions prevent saving.")),
+        ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
+            description: ( localize(7206, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
-        [InlineChatConfigKeys.HoldToSpeech]: {
+        ["inlineChat.holdToSpeech" ]: {
             description: ( localize(
-                7035,
+                7207,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
             type: 'boolean'
         },
-        [InlineChatConfigKeys.AccessibleDiffView]: {
+        ["inlineChat.accessibleDiffView" ]: {
             description: ( localize(
-                7036,
+                7208,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -83,24 +68,16 @@ var EditMode;
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localize(
-                    7037,
-                    "The accessible diff viewer is based screen reader mode being enabled."
+                    7209,
+                    "The accessible diff viewer is based on screen reader mode being enabled."
                 )),
-                ( localize(7038, "The accessible diff viewer is always enabled.")),
-                ( localize(7039, "The accessible diff viewer is never enabled.")),
+                ( localize(7210, "The accessible diff viewer is always enabled.")),
+                ( localize(7211, "The accessible diff viewer is never enabled.")),
             ],
         },
-        [InlineChatConfigKeys.StartWithOverlayWidget]: {
+        ["inlineChat.experimental.enableZoneToolbar" ]: {
             description: ( localize(
-                7040,
-                "Whether inline chat opens directly as zone widget, between the lines, or as overlay widget which turns into a zone."
-            )),
-            default: false,
-            type: 'boolean',
-        },
-        [InlineChatConfigKeys.ZoneToolbar]: {
-            description: ( localize(
-                7041,
+                7212,
                 "Whether to show a toolbar to accept or reject changes in the inline chat changes view."
             )),
             default: false,
@@ -110,65 +87,66 @@ var EditMode;
     }
 });
 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, ( 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_POSSIBLE = ( (new RawContextKey('inlineChatPossible', false, ( localize(
+    7213,
+    "Whether a provider for inline chat exists and whether an editor for inline chat is open"
+)))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7214, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7215, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7216, "Whether the interactive editor input is focused")))));
 const CTX_INLINE_CHAT_EDITING = ( (new RawContextKey('inlineChatEditing', true, ( localize(
-    7045,
+    7217,
     "Whether the user is currently editing or generating code in the inline chat"
 )))));
-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_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7218, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7219, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7048,
+    7220,
     "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(
-    7049,
+    7221,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7052,
+    7224,
     "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(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(7058, "Whether an inline chat request is currently in progress")))));
-const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localize(
-    7059,
-    "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
-)))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7225, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7226, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7227, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7228, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7229, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', "live" )));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7230, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey(
+    'inlineChatResponseType',
+    "none" ,
+    ( localize(
+        7231,
+        "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
+    ))
+)));
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
 const ACTION_DISCARD_CHANGES = 'inlineChat.discardHunkChange';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
 const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const ACTION_REPORT_ISSUE = 'inlineChat.reportIssue';
-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(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 };
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7232, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7233, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7234, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7235, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7236, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7237, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7238, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7239, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7240, "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(7241, '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(7241, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7242, "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(7243, '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_POSSIBLE, 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, INLINE_CHAT_ID, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js

@@ -7,7 +7,6 @@ import { ITextModelService } from '../../../../editor/common/services/resolverSe
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { EditorInputCapabilities } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IInteractiveDocumentService } from './interactiveDocumentService.service.js';
 import { IInteractiveHistoryService } from './interactiveHistoryService.service.js';
@@ -83,9 +82,9 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         this._register(this.primary.onDidChangeCapabilities(() => this._onDidChangeCapabilities.fire()));
     }
     get capabilities() {
-        const scratchPad = this.isScratchpad ? EditorInputCapabilities.Scratchpad : 0;
-        return EditorInputCapabilities.Untitled
-            | EditorInputCapabilities.Readonly
+        const scratchPad = this.isScratchpad ? 512  : 0;
+        return 4
+            | 2
             | scratchPad;
     }
     async _resolveEditorModel() {
@@ -115,7 +114,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
     }
     async save(group, options) {
         if (this._editorModelReference) {
-            if (this.hasCapability(EditorInputCapabilities.Untitled)) {
+            if (this.hasCapability(4 )) {
                 return this.saveAs(group, options);
             }
             else {

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ListResizeColumnAction } from './listResizeColumnAction.js';
 let ListContext = class ListContext {
@@ -13,6 +13,6 @@ let ListContext = class ListContext {
 ListContext = ( __decorate([
     ( __param(0, IContextKeyService))
 ], ListContext));
-registerWorkbenchContribution2(ListContext.ID, ListContext, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(ListContext.ID, ListContext, 1 );
 registerAction2(ListResizeColumnAction);
 export { ListContext };

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(4529, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(4530, "List")), original: 'List' },
+            title: { value: ( localize(4573, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(4574, "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(9822, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9906, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(9823, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(9907, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                9824,
+                9908,
                 "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(9825, "Please enter an integer."));
+            return ( localize(9909, "Please enter an integer."));
         }
         else if (percentage < 0 || percentage > 100) {
             return ( localize(
-                9826,
+                9910,
                 "Please enter a number greater than 0 and less than or equal to 100."
             ));
         }

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

@@ -5,6 +5,7 @@ import { Marked } from 'marked';
 import { Schemas } from '../../../../base/common/network.js';
 import { escape } from '../../../../base/common/strings.js';
 import { tokenizeToString } from '../../../../editor/common/languages/textToHtmlTokenizer.js';
+import { markedGfmHeadingIdPlugin } from './markedGfmHeadingIdPlugin.js';
 const DEFAULT_MARKDOWN_STYLES = `
 body {
 	padding: 10px 20px;
@@ -185,8 +186,8 @@ async function renderMarkdownDocument(text, extensionService, languageService, o
             const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
             return tokenizeToString(languageService, code, languageId);
         }
-    }));
-    const raw = await m.parse(text, { renderer: options?.renderer, async: true });
+    }), markedGfmHeadingIdPlugin(), ...(options?.markedExtensions ?? []));
+    const raw = await m.parse(text, { async: true });
     if (options?.shouldSanitize ?? true) {
         return sanitize(raw, options?.allowUnknownProtocols ?? false);
     }

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

@@ -0,0 +1,39 @@
+const githubSlugReplaceRegex = /[\0-\x1F!-,\.\/:-@\[-\^`\{-\xA9\xAB-\xB4\xB6-\xB9\xBB-\xBF\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0378\u0379\u037E\u0380-\u0385\u0387\u038B\u038D\u03A2\u03F6\u0482\u0530\u0557\u0558\u055A-\u055F\u0589-\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05CF\u05EB-\u05EE\u05F3-\u060F\u061B-\u061F\u066A-\u066D\u06D4\u06DD\u06DE\u06E9\u06FD\u06FE\u0700-\u070F\u074B\u074C\u07B2-\u07BF\u07F6-\u07F9\u07FB\u07FC\u07FE\u07FF\u082E-\u083F\u085C-\u085F\u086B-\u089F\u08B5\u08C8-\u08D2\u08E2\u0964\u0965\u0970\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09F2-\u09FB\u09FD\u09FF\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF0-\u0AF8\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B54\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B70\u0B72-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BF0-\u0BFF\u0C0D\u0C11\u0C29\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5B-\u0C5F\u0C64\u0C65\u0C70-\u0C7F\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0CFF\u0D0D\u0D11\u0D45\u0D49\u0D4F-\u0D53\u0D58-\u0D5E\u0D64\u0D65\u0D70-\u0D79\u0D80\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DE5\u0DF0\u0DF1\u0DF4-\u0E00\u0E3B-\u0E3F\u0E4F\u0E5A-\u0E80\u0E83\u0E85\u0E8B\u0EA4\u0EA6\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F01-\u0F17\u0F1A-\u0F1F\u0F2A-\u0F34\u0F36\u0F38\u0F3A-\u0F3D\u0F48\u0F6D-\u0F70\u0F85\u0F98\u0FBD-\u0FC5\u0FC7-\u0FFF\u104A-\u104F\u109E\u109F\u10C6\u10C8-\u10CC\u10CE\u10CF\u10FB\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u1360-\u137F\u1390-\u139F\u13F6\u13F7\u13FE-\u1400\u166D\u166E\u1680\u169B-\u169F\u16EB-\u16ED\u16F9-\u16FF\u170D\u1715-\u171F\u1735-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17D4-\u17D6\u17D8-\u17DB\u17DE\u17DF\u17EA-\u180A\u180E\u180F\u181A-\u181F\u1879-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191F\u192C-\u192F\u193C-\u1945\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DA-\u19FF\u1A1C-\u1A1F\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1AA6\u1AA8-\u1AAF\u1AC1-\u1AFF\u1B4C-\u1B4F\u1B5A-\u1B6A\u1B74-\u1B7F\u1BF4-\u1BFF\u1C38-\u1C3F\u1C4A-\u1C4C\u1C7E\u1C7F\u1C89-\u1C8F\u1CBB\u1CBC\u1CC0-\u1CCF\u1CD3\u1CFB-\u1CFF\u1DFA\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FBD\u1FBF-\u1FC1\u1FC5\u1FCD-\u1FCF\u1FD4\u1FD5\u1FDC-\u1FDF\u1FED-\u1FF1\u1FF5\u1FFD-\u203E\u2041-\u2053\u2055-\u2070\u2072-\u207E\u2080-\u208F\u209D-\u20CF\u20F1-\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F-\u215F\u2189-\u24B5\u24EA-\u2BFF\u2C2F\u2C5F\u2CE5-\u2CEA\u2CF4-\u2CFF\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D70-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E00-\u2E2E\u2E30-\u3004\u3008-\u3020\u3030\u3036\u3037\u303D-\u3040\u3097\u3098\u309B\u309C\u30A0\u30FB\u3100-\u3104\u3130\u318F-\u319F\u31C0-\u31EF\u3200-\u33FF\u4DC0-\u4DFF\u9FFD-\u9FFF\uA48D-\uA4CF\uA4FE\uA4FF\uA60D-\uA60F\uA62C-\uA63F\uA673\uA67E\uA6F2-\uA716\uA720\uA721\uA789\uA78A\uA7C0\uA7C1\uA7CB-\uA7F4\uA828-\uA82B\uA82D-\uA83F\uA874-\uA87F\uA8C6-\uA8CF\uA8DA-\uA8DF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA954-\uA95F\uA97D-\uA97F\uA9C1-\uA9CE\uA9DA-\uA9DF\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A-\uAA5F\uAA77-\uAA79\uAAC3-\uAADA\uAADE\uAADF\uAAF0\uAAF1\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F\uAB5B\uAB6A-\uAB6F\uABEB\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uD7FF\uE000-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB29\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBB2-\uFBD2\uFD3E-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFC-\uFDFF\uFE10-\uFE1F\uFE30-\uFE32\uFE35-\uFE4C\uFE50-\uFE6F\uFE75\uFEFD-\uFF0F\uFF1A-\uFF20\uFF3B-\uFF3E\uFF40\uFF5B-\uFF65\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFFF]|\uD800[\uDC0C\uDC27\uDC3B\uDC3E\uDC4E\uDC4F\uDC5E-\uDC7F\uDCFB-\uDD3F\uDD75-\uDDFC\uDDFE-\uDE7F\uDE9D-\uDE9F\uDED1-\uDEDF\uDEE1-\uDEFF\uDF20-\uDF2C\uDF4B-\uDF4F\uDF7B-\uDF7F\uDF9E\uDF9F\uDFC4-\uDFC7\uDFD0\uDFD6-\uDFFF]|\uD801[\uDC9E\uDC9F\uDCAA-\uDCAF\uDCD4-\uDCD7\uDCFC-\uDCFF\uDD28-\uDD2F\uDD64-\uDDFF\uDF37-\uDF3F\uDF56-\uDF5F\uDF68-\uDFFF]|\uD802[\uDC06\uDC07\uDC09\uDC36\uDC39-\uDC3B\uDC3D\uDC3E\uDC56-\uDC5F\uDC77-\uDC7F\uDC9F-\uDCDF\uDCF3\uDCF6-\uDCFF\uDD16-\uDD1F\uDD3A-\uDD7F\uDDB8-\uDDBD\uDDC0-\uDDFF\uDE04\uDE07-\uDE0B\uDE14\uDE18\uDE36\uDE37\uDE3B-\uDE3E\uDE40-\uDE5F\uDE7D-\uDE7F\uDE9D-\uDEBF\uDEC8\uDEE7-\uDEFF\uDF36-\uDF3F\uDF56-\uDF5F\uDF73-\uDF7F\uDF92-\uDFFF]|\uD803[\uDC49-\uDC7F\uDCB3-\uDCBF\uDCF3-\uDCFF\uDD28-\uDD2F\uDD3A-\uDE7F\uDEAA\uDEAD-\uDEAF\uDEB2-\uDEFF\uDF1D-\uDF26\uDF28-\uDF2F\uDF51-\uDFAF\uDFC5-\uDFDF\uDFF7-\uDFFF]|\uD804[\uDC47-\uDC65\uDC70-\uDC7E\uDCBB-\uDCCF\uDCE9-\uDCEF\uDCFA-\uDCFF\uDD35\uDD40-\uDD43\uDD48-\uDD4F\uDD74\uDD75\uDD77-\uDD7F\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDFF\uDE12\uDE38-\uDE3D\uDE3F-\uDE7F\uDE87\uDE89\uDE8E\uDE9E\uDEA9-\uDEAF\uDEEB-\uDEEF\uDEFA-\uDEFF\uDF04\uDF0D\uDF0E\uDF11\uDF12\uDF29\uDF31\uDF34\uDF3A\uDF45\uDF46\uDF49\uDF4A\uDF4E\uDF4F\uDF51-\uDF56\uDF58-\uDF5C\uDF64\uDF65\uDF6D-\uDF6F\uDF75-\uDFFF]|\uD805[\uDC4B-\uDC4F\uDC5A-\uDC5D\uDC62-\uDC7F\uDCC6\uDCC8-\uDCCF\uDCDA-\uDD7F\uDDB6\uDDB7\uDDC1-\uDDD7\uDDDE-\uDDFF\uDE41-\uDE43\uDE45-\uDE4F\uDE5A-\uDE7F\uDEB9-\uDEBF\uDECA-\uDEFF\uDF1B\uDF1C\uDF2C-\uDF2F\uDF3A-\uDFFF]|\uD806[\uDC3B-\uDC9F\uDCEA-\uDCFE\uDD07\uDD08\uDD0A\uDD0B\uDD14\uDD17\uDD36\uDD39\uDD3A\uDD44-\uDD4F\uDD5A-\uDD9F\uDDA8\uDDA9\uDDD8\uDDD9\uDDE2\uDDE5-\uDDFF\uDE3F-\uDE46\uDE48-\uDE4F\uDE9A-\uDE9C\uDE9E-\uDEBF\uDEF9-\uDFFF]|\uD807[\uDC09\uDC37\uDC41-\uDC4F\uDC5A-\uDC71\uDC90\uDC91\uDCA8\uDCB7-\uDCFF\uDD07\uDD0A\uDD37-\uDD39\uDD3B\uDD3E\uDD48-\uDD4F\uDD5A-\uDD5F\uDD66\uDD69\uDD8F\uDD92\uDD99-\uDD9F\uDDAA-\uDEDF\uDEF7-\uDFAF\uDFB1-\uDFFF]|\uD808[\uDF9A-\uDFFF]|\uD809[\uDC6F-\uDC7F\uDD44-\uDFFF]|[\uD80A\uD80B\uD80E-\uD810\uD812-\uD819\uD824-\uD82B\uD82D\uD82E\uD830-\uD833\uD837\uD839\uD83D\uD83F\uD87B-\uD87D\uD87F\uD885-\uDB3F\uDB41-\uDBFF][\uDC00-\uDFFF]|\uD80D[\uDC2F-\uDFFF]|\uD811[\uDE47-\uDFFF]|\uD81A[\uDE39-\uDE3F\uDE5F\uDE6A-\uDECF\uDEEE\uDEEF\uDEF5-\uDEFF\uDF37-\uDF3F\uDF44-\uDF4F\uDF5A-\uDF62\uDF78-\uDF7C\uDF90-\uDFFF]|\uD81B[\uDC00-\uDE3F\uDE80-\uDEFF\uDF4B-\uDF4E\uDF88-\uDF8E\uDFA0-\uDFDF\uDFE2\uDFE5-\uDFEF\uDFF2-\uDFFF]|\uD821[\uDFF8-\uDFFF]|\uD823[\uDCD6-\uDCFF\uDD09-\uDFFF]|\uD82C[\uDD1F-\uDD4F\uDD53-\uDD63\uDD68-\uDD6F\uDEFC-\uDFFF]|\uD82F[\uDC6B-\uDC6F\uDC7D-\uDC7F\uDC89-\uDC8F\uDC9A-\uDC9C\uDC9F-\uDFFF]|\uD834[\uDC00-\uDD64\uDD6A-\uDD6C\uDD73-\uDD7A\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDE41\uDE45-\uDFFF]|\uD835[\uDC55\uDC9D\uDCA0\uDCA1\uDCA3\uDCA4\uDCA7\uDCA8\uDCAD\uDCBA\uDCBC\uDCC4\uDD06\uDD0B\uDD0C\uDD15\uDD1D\uDD3A\uDD3F\uDD45\uDD47-\uDD49\uDD51\uDEA6\uDEA7\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3\uDFCC\uDFCD]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85-\uDE9A\uDEA0\uDEB0-\uDFFF]|\uD838[\uDC07\uDC19\uDC1A\uDC22\uDC25\uDC2B-\uDCFF\uDD2D-\uDD2F\uDD3E\uDD3F\uDD4A-\uDD4D\uDD4F-\uDEBF\uDEFA-\uDFFF]|\uD83A[\uDCC5-\uDCCF\uDCD7-\uDCFF\uDD4C-\uDD4F\uDD5A-\uDFFF]|\uD83B[\uDC00-\uDDFF\uDE04\uDE20\uDE23\uDE25\uDE26\uDE28\uDE33\uDE38\uDE3A\uDE3C-\uDE41\uDE43-\uDE46\uDE48\uDE4A\uDE4C\uDE50\uDE53\uDE55\uDE56\uDE58\uDE5A\uDE5C\uDE5E\uDE60\uDE63\uDE65\uDE66\uDE6B\uDE73\uDE78\uDE7D\uDE7F\uDE8A\uDE9C-\uDEA0\uDEA4\uDEAA\uDEBC-\uDFFF]|\uD83C[\uDC00-\uDD2F\uDD4A-\uDD4F\uDD6A-\uDD6F\uDD8A-\uDFFF]|\uD83E[\uDC00-\uDFEF\uDFFA-\uDFFF]|\uD869[\uDEDE-\uDEFF]|\uD86D[\uDF35-\uDF3F]|\uD86E[\uDC1E\uDC1F]|\uD873[\uDEA2-\uDEAF]|\uD87A[\uDFE1-\uDFFF]|\uD87E[\uDE1E-\uDFFF]|\uD884[\uDF4B-\uDFFF]|\uDB40[\uDC00-\uDCFF\uDDF0-\uDFFF]/g;
+function slugify(heading) {
+    const slugifiedHeading = heading.trim()
+        .toLowerCase()
+        .replace(githubSlugReplaceRegex, '')
+        .replace(/\s/g, '-');
+    return slugifiedHeading;
+}
+const unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
+function unescape(html) {
+    return html.replace(unescapeTest, (_, n) => {
+        n = n.toLowerCase();
+        if (n === 'colon') {
+            return ':';
+        }
+        if (n.charAt(0) === '#') {
+            return n.charAt(1) === 'x'
+                ? String.fromCharCode(parseInt(n.substring(2), 16))
+                : String.fromCharCode(+n.substring(1));
+        }
+        return '';
+    });
+}
+function markedGfmHeadingIdPlugin({ prefix = '', globalSlugs = false } = {}) {
+    return {
+        renderer: {
+            heading({ tokens, depth }) {
+                const text = this.parser.parseInline(tokens);
+                const raw = unescape(this.parser.parseInline(tokens, this.parser.textRenderer))
+                    .trim()
+                    .replace(/<[!\/a-z].*?>/gi, '');
+                const level = depth;
+                const id = `${prefix}${slugify(raw)}`;
+                return `<h${level} id="${id}">${text}</h${level}>\n`;
+            },
+        },
+    };
+}
+export { markedGfmHeadingIdPlugin };

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

@@ -1,9 +1,4 @@
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-var MarkersViewMode;
-( (function(MarkersViewMode) {
-    MarkersViewMode["Table"] = "table";
-    MarkersViewMode["Tree"] = "tree";
-})(MarkersViewMode || (MarkersViewMode = {})));
 var Markers;
 ( (function(Markers) {
     Markers.MARKERS_CONTAINER_ID = 'workbench.panel.markers';
@@ -25,7 +20,7 @@ var Markers;
 })(Markers || (Markers = {})));
 var MarkersContextKeys;
 ( (function(MarkersContextKeys) {
-    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', MarkersViewMode.Tree));
+    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', "tree" ));
     MarkersContextKeys.MarkersTreeVisibilityContextKey = ( new RawContextKey('problemsVisibility', false));
     MarkersContextKeys.MarkerFocusContextKey = ( new RawContextKey('problemFocus', false));
     MarkersContextKeys.MarkerViewFilterFocusContextKey = ( new RawContextKey('problemsFilterFocus', false));
@@ -36,4 +31,4 @@ var MarkersContextKeys;
     MarkersContextKeys.ShowActiveFileFilterContextKey = ( new RawContextKey('problems.filter.activeFile', false));
     MarkersContextKeys.ShowExcludedFilesFilterContextKey = ( new RawContextKey('problems.filter.excludedFiles', true));
 })(MarkersContextKeys || (MarkersContextKeys = {})));
-export { Markers, MarkersContextKeys, MarkersViewMode };
+export { Markers, MarkersContextKeys };

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

@@ -1,10 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { assertFn } from '../../../../base/common/assert.js';
 import '../../../../base/common/arrays.js';
-import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/event.js';
+import '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
@@ -13,7 +15,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
-import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput, EditorInputCapabilities } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
 import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
@@ -66,14 +68,14 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return DEFAULT_EDITOR_ASSOCIATION.id;
     }
     get capabilities() {
-        let capabilities = super.capabilities | EditorInputCapabilities.MultipleEditors;
+        let capabilities = super.capabilities | 256 ;
         if (this.useWorkingCopy) {
-            capabilities |= EditorInputCapabilities.Untitled;
+            capabilities |= 4 ;
         }
         return capabilities;
     }
     getName() {
-        return ( localize(7816, "Merging: {0}", super.getName()));
+        return ( localize(7720, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {