@codingame/monaco-vscode-api 2.2.1 → 3.0.0

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

@@ -1,52 +1,56 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import './inlineChat.css.js';
-import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
-import { CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_INPUT, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_FEEDBACK } from '../common/inlineChat.js';
 import { h, addDisposableListener, getTotalWidth, Dimension, getTotalHeight, reset, getActiveElement } from '../../../../base/browser/dom.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { MicrotaskEmitter, Event, Emitter } from '../../../../base/common/event.js';
-import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
-import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import './inlineChat.css.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { AccessibleDiffViewer } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
 import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
-import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
-import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
-import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
-import { DEFAULT_FONT_FAMILY } from '../../../browser/style.js';
-import { ResourceLabel } from '../../../browser/labels.js';
-import { FileKind } from '../../../../platform/files/common/files.js';
-import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
-import { invertLineRange, asRange } from './utils.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
+import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
+import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
+import { localizeWithPath } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { ExpansionState } from './inlineChatSession.js';
-import { status } from '../../../../base/browser/ui/aria/aria.js';
-import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
-import { SlashCommandContentWidget } from '../../chat/browser/chatSlashCommandContentWidget.js';
-import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
-import { assertType } from '../../../../base/common/types.js';
-import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { ChatEditorOptions } from '../../chat/browser/chatOptions.js';
-import { editorForeground, inputBackground, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
-import { Lazy } from '../../../../base/common/lazy.js';
-import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
-import { ChatResponseViewModel } from '../../chat/common/chatViewModel.js';
-import { ChatModel, ChatResponseModel } from '../../chat/common/chatModel.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { editorForeground, inputBackground, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { ResourceLabel } from '../../../browser/labels.js';
+import { DEFAULT_FONT_FAMILY } from '../../../browser/style.js';
+import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
+import { ChatFollowups } from '../../chat/browser/chatFollowups.js';
 import { ChatListItemRenderer } from '../../chat/browser/chatListRenderer.js';
-import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ChatEditorOptions } from '../../chat/browser/chatOptions.js';
+import { SlashCommandContentWidget } from '../../chat/browser/chatSlashCommandContentWidget.js';
 import { IChatAgentService } from '../../chat/common/chatAgents.js';
-import { ChatFollowups } from '../../chat/browser/chatFollowups.js';
-var InlineChatWidget_1;
+import { ChatModel, ChatResponseModel } from '../../chat/common/chatModel.js';
+import { ChatResponseViewModel } from '../../chat/common/chatViewModel.js';
+import { ExpansionState } from './inlineChatSession.js';
+import { invertLineRange, asRange } from './utils.js';
+import { CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_INPUT, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_FEEDBACK } from '../common/inlineChat.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { constObservable } from '../../../../base/common/observableInternal/utils.js';
+var InlineChatWidget_1, HunkAccessibleDiffViewer_1;
 const defaultAriaLabel = ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/browser/inlineChatWidget',
     'aria-label',
@@ -120,7 +124,7 @@ const _previewEditorEditorOptions = {
 let InlineChatWidget = class InlineChatWidget {
     static { InlineChatWidget_1 = this; }
     static { this._modelPool = 1; }
-    constructor(parentEditor, _options, _modelService, _contextKeyService, _languageFeaturesService, _keybindingService, _instantiationService, _accessibilityService, _configurationService, _accessibleViewService, _editorWorkerService, _logService, _textModelResolverService, _chatAgentService) {
+    constructor(parentEditor, _options, _modelService, _contextKeyService, _languageFeaturesService, _keybindingService, _instantiationService, _accessibilityService, _configurationService, _accessibleViewService, _logService, _textModelResolverService, _chatAgentService) {
         this.parentEditor = parentEditor;
         this._modelService = _modelService;
         this._contextKeyService = _contextKeyService;
@@ -130,7 +134,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._accessibilityService = _accessibilityService;
         this._configurationService = _configurationService;
         this._accessibleViewService = _accessibleViewService;
-        this._editorWorkerService = _editorWorkerService;
         this._logService = _logService;
         this._textModelResolverService = _textModelResolverService;
         this._chatAgentService = _chatAgentService;
@@ -155,6 +158,7 @@ let InlineChatWidget = class InlineChatWidget {
                 h('div.messageActions@messageActions')
             ]),
             h('div.followUps.hidden@followUps'),
+            h('div.accessibleViewer@accessibleViewer'),
             h('div.status@status', [
                 h('div.label.info.hidden@infoLabel'),
                 h('div.actions.hidden@statusToolbar'),
@@ -165,6 +169,7 @@ let InlineChatWidget = class InlineChatWidget {
         this._store = ( new DisposableStore());
         this._slashCommands = this._store.add(( new DisposableStore()));
         this._previewDiffModel = this._store.add(( new MutableDisposable()));
+        this._accessibleViewer = this._store.add(( new MutableDisposable()));
         this._previewCreateDispoable = this._store.add(( new MutableDisposable()));
         this._onDidChangeHeight = this._store.add(( new MicrotaskEmitter()));
         this.onDidChangeHeight = Event.filter(this._onDidChangeHeight.event, _ => !this._isLayouting);
@@ -251,7 +256,7 @@ let InlineChatWidget = class InlineChatWidget {
         }));
         updateFocused();
         this._elements.placeholder.style.fontSize = `${this._inputEditor.getOption(52 )}px`;
-        this._elements.placeholder.style.lineHeight = `${this._inputEditor.getOption(66 )}px`;
+        this._elements.placeholder.style.lineHeight = `${this._inputEditor.getOption(67 )}px`;
         this._store.add(addDisposableListener(this._elements.placeholder, 'click', () => this._inputEditor.focus()));
         const currentContentHeight = 0;
         const togglePlaceholder = () => {
@@ -272,7 +277,8 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(this._slashCommandContentWidget);
         this._store.add(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.editorToolbar, _options.menuId, {
             telemetrySource: 'interactiveEditorWidget-toolbar',
-            toolbarOptions: { primaryGroup: 'main' }
+            toolbarOptions: { primaryGroup: 'main' },
+            hiddenItemStrategy: 0
         }));
         this._progressBar = ( new ProgressBar(this._elements.progress));
         this._store.add(this._progressBar);
@@ -365,6 +371,9 @@ let InlineChatWidget = class InlineChatWidget {
     layout(_dim) {
         this._isLayouting = true;
         try {
+            if (this._accessibleViewer.value) {
+                this._accessibleViewer.value.width = _dim.width - 12;
+            }
             const widgetToolbarWidth = getTotalWidth(this._elements.widgetToolbar);
             const editorToolbarWidth = getTotalWidth(this._elements.editorToolbar) + 8 ;
             const innerEditorWidth = _dim.width - editorToolbarWidth - widgetToolbarWidth;
@@ -390,7 +399,7 @@ let InlineChatWidget = class InlineChatWidget {
                     this._previewCreateEditor.value.layout(previewCreateDim);
                     this._elements.previewCreate.style.height = `${previewCreateDim.height}px`;
                 }
-                const lineHeight = this.parentEditor.getOption(66 );
+                const lineHeight = this.parentEditor.getOption(67 );
                 const editorHeight = this.parentEditor.getLayoutInfo().height;
                 const editorHeightInLines = Math.floor(editorHeight / lineHeight);
                 this._elements.root.style.setProperty('--vscode-inline-chat-cropped', String(Math.floor(editorHeightInLines / 5)));
@@ -411,7 +420,8 @@ let InlineChatWidget = class InlineChatWidget {
         const previewDiffHeight = this._previewDiffEditor.hasValue && this._previewDiffEditor.value.getModel() ? 12 + Math.min(300, Math.max(0, this._previewDiffEditor.value.getContentHeight())) : 0;
         const previewCreateTitleHeight = getTotalHeight(this._elements.previewCreateTitle);
         const previewCreateHeight = this._previewCreateEditor.hasValue && this._previewCreateEditor.value.getModel() ? 18 + Math.min(300, Math.max(0, this._previewCreateEditor.value.getContentHeight())) : 0;
-        return base + editorHeight + detectedIntentHeight + followUpsHeight + chatResponseHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + 18  + 8 ;
+        const accessibleViewHeight = this._accessibleViewer.value?.height ?? 0;
+        return base + editorHeight + detectedIntentHeight + followUpsHeight + chatResponseHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + accessibleViewHeight + 18  + 8 ;
     }
     updateProgress(show) {
         if (show) {
@@ -500,7 +510,7 @@ let InlineChatWidget = class InlineChatWidget {
             const viewModel = this._chatMessageDisposables.add(( new ChatResponseViewModel(responseModel, this._logService)));
             const renderOptions = { renderStyle: 'compact', noHeader: true, noPadding: true };
             const chatRendererDelegate = { getListLength() { return 1; } };
-            const renderer = this._chatMessageDisposables.add(this._instantiationService.createInstance(ChatListItemRenderer, this._editorOptions, renderOptions, chatRendererDelegate));
+            const renderer = this._chatMessageDisposables.add(this._instantiationService.createInstance(ChatListItemRenderer, this._editorOptions, renderOptions, chatRendererDelegate, undefined));
             renderer.layout(this._elements.chatMessageContent.clientWidth - 4);
             this._chatMessageDisposables.add(this._onDidChangeLayout.event(() => {
                 renderer.layout(this._elements.chatMessageContent.clientWidth - 4);
@@ -538,13 +548,7 @@ let InlineChatWidget = class InlineChatWidget {
         this._elements.followUps.classList.toggle('hidden', !items || items.length === 0);
         reset(this._elements.followUps);
         if (items && items.length > 0 && onFollowup) {
-            this._followUpDisposables.add(( new ChatFollowups(
-                this._elements.followUps,
-                items,
-                undefined,
-                onFollowup,
-                this._contextKeyService
-            )));
+            this._followUpDisposables.add(this._instantiationService.createInstance(ChatFollowups, this._elements.followUps, items, undefined, onFollowup));
         }
         this._onDidChangeHeight.fire();
     }
@@ -634,6 +638,8 @@ let InlineChatWidget = class InlineChatWidget {
         this.updateInfo('');
         this.hideCreatePreview();
         this.hideEditsPreview();
+        this._accessibleViewer.clear();
+        this._elements.accessibleViewer.classList.toggle('hidden', true);
         this._onDidChangeHeight.fire();
     }
     focus() {
@@ -642,28 +648,25 @@ let InlineChatWidget = class InlineChatWidget {
     hasFocus() {
         return this.domNode.contains(getActiveElement());
     }
-    async showEditsPreview(textModel0, textModelN) {
-        this._elements.previewDiff.classList.remove('hidden');
-        const diff = await this._editorWorkerService.computeDiff(textModel0.uri, textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced');
-        if (!diff || diff.changes.length === 0) {
+    showEditsPreview(hunks, textModel0, textModelN) {
+        if (hunks.size === 0) {
             this.hideEditsPreview();
             return;
         }
+        this._elements.previewDiff.classList.remove('hidden');
         this._previewDiffEditor.value.setModel({ original: textModel0, modified: textModelN });
-        let originalLineRange = diff.changes[0].original;
-        let modifiedLineRange = diff.changes[0].modified;
-        for (let i = 1; i < diff.changes.length; i++) {
-            originalLineRange = originalLineRange.join(diff.changes[i].original);
-            modifiedLineRange = modifiedLineRange.join(diff.changes[i].modified);
+        let originalLineRange;
+        let modifiedLineRange;
+        for (const item of hunks.getInfo()) {
+            const [first0] = item.getRanges0();
+            const [firstN] = item.getRangesN();
+            originalLineRange = !originalLineRange ? LineRange.fromRangeInclusive(first0) : originalLineRange.join(LineRange.fromRangeInclusive(first0));
+            modifiedLineRange = !modifiedLineRange ? LineRange.fromRangeInclusive(firstN) : modifiedLineRange.join(LineRange.fromRangeInclusive(firstN));
+        }
+        if (!originalLineRange || !modifiedLineRange) {
+            this.hideEditsPreview();
+            return;
         }
-        const pad = 3;
-        const newStartLine = Math.max(1, originalLineRange.startLineNumber - pad);
-        modifiedLineRange = ( new LineRange(newStartLine, modifiedLineRange.endLineNumberExclusive));
-        originalLineRange = ( new LineRange(newStartLine, originalLineRange.endLineNumberExclusive));
-        const newEndLineModified = Math.min(modifiedLineRange.endLineNumberExclusive + pad, textModelN.getLineCount());
-        modifiedLineRange = ( new LineRange(modifiedLineRange.startLineNumber, newEndLineModified));
-        const newEndLineOriginal = Math.min(originalLineRange.endLineNumberExclusive + pad, textModel0.getLineCount());
-        originalLineRange = ( new LineRange(originalLineRange.startLineNumber, newEndLineOriginal));
         const hiddenOriginal = invertLineRange(originalLineRange, textModel0);
         const hiddenModified = invertLineRange(modifiedLineRange, textModelN);
         this._previewDiffEditor.value.getOriginalEditor().setHiddenAreas(( hiddenOriginal.map(lr => asRange(lr, textModel0))), 'diff-hidden');
@@ -771,6 +774,12 @@ let InlineChatWidget = class InlineChatWidget {
         this._slashCommands.add(this._inputEditor.onDidChangeModelContent(updateSlashDecorations));
         updateSlashDecorations();
     }
+    showAccessibleHunk(session, hunkData) {
+        this._elements.accessibleViewer.classList.remove('hidden');
+        this._accessibleViewer.clear();
+        this._accessibleViewer.value = this._instantiationService.createInstance(HunkAccessibleDiffViewer, this._elements.accessibleViewer, session, hunkData, ( new AccessibleHunk(this.parentEditor, session, hunkData)));
+        this._onDidChangeHeight.fire();
+    }
 };
 InlineChatWidget = InlineChatWidget_1 = ( __decorate([
     ( __param(2, IModelService)),
@@ -781,10 +790,9 @@ InlineChatWidget = InlineChatWidget_1 = ( __decorate([
     ( __param(7, IAccessibilityService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, IAccessibleViewService)),
-    ( __param(10, IEditorWorkerService)),
-    ( __param(11, ILogService)),
-    ( __param(12, ITextModelService)),
-    ( __param(13, IChatAgentService))
+    ( __param(10, ILogService)),
+    ( __param(11, ITextModelService)),
+    ( __param(12, IChatAgentService))
 ], InlineChatWidget));
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     constructor(editor, _instaService, contextKeyService) {
@@ -843,7 +851,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
     }
     _computeHeightInLines() {
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         return this.widget.getHeight() / lineHeight;
     }
     _relayout() {
@@ -917,4 +925,68 @@ InlineChatZoneWidget = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IContextKeyService))
 ], InlineChatZoneWidget));
+let HunkAccessibleDiffViewer = HunkAccessibleDiffViewer_1 = class HunkAccessibleDiffViewer extends AccessibleDiffViewer {
+    set width(value) {
+        this._width2.set(value, undefined);
+    }
+    constructor(parentNode, session, hunk, models, instantiationService) {
+        const width = observableValue('width', 0);
+        const diff = observableValue('diff', HunkAccessibleDiffViewer_1._asMapping(hunk));
+        const diffs = derived(r => [diff.read(r)]);
+        const lines = Math.min(10, 8 + diff.get().changedLineCount);
+        const height = models.getModifiedOptions().get(67 ) * lines;
+        super(parentNode, constObservable(true), () => { }, constObservable(false), width, constObservable(height), diffs, models, instantiationService);
+        this.height = height;
+        this._width2 = width;
+        this._store.add(session.textModelN.onDidChangeContent(() => {
+            diff.set(HunkAccessibleDiffViewer_1._asMapping(hunk), undefined);
+        }));
+    }
+    static _asMapping(hunk) {
+        const ranges0 = hunk.getRanges0();
+        const rangesN = hunk.getRangesN();
+        const originalLineRange = LineRange.fromRangeInclusive(ranges0[0]);
+        const modifiedLineRange = LineRange.fromRangeInclusive(rangesN[0]);
+        const innerChanges = [];
+        for (let i = 1; i < ranges0.length; i++) {
+            innerChanges.push(( new RangeMapping(ranges0[i], rangesN[i])));
+        }
+        return ( new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, innerChanges));
+    }
+};
+HunkAccessibleDiffViewer = HunkAccessibleDiffViewer_1 = ( __decorate([
+    ( __param(4, IInstantiationService))
+], HunkAccessibleDiffViewer));
+class AccessibleHunk {
+    constructor(_editor, _session, _hunk) {
+        this._editor = _editor;
+        this._session = _session;
+        this._hunk = _hunk;
+    }
+    getOriginalModel() {
+        return this._session.textModel0;
+    }
+    getModifiedModel() {
+        return this._session.textModelN;
+    }
+    getOriginalOptions() {
+        return this._editor.getOptions();
+    }
+    getModifiedOptions() {
+        return this._editor.getOptions();
+    }
+    originalReveal(range) {
+    }
+    modifiedReveal(range) {
+        this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], 0 );
+    }
+    modifiedSetSelection(range) {
+    }
+    modifiedFocus() {
+        this._editor.focus();
+    }
+    getModifiedPosition() {
+        return this._hunk.getRangesN()[0].getStartPosition();
+    }
+}
 export { InlineChatWidget, InlineChatZoneWidget, _inputEditorOptions };

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

@@ -207,25 +207,20 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
                 'mode',
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
-            default: "livePreview" ,
+            default: "live" ,
             type: 'string',
-            enum: ["livePreview" , "preview" , "live" ],
+            enum: ["live" , "preview" ],
             markdownEnumDescriptions: [
                 ( localizeWithPath(
                     'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'mode.livePreview',
-                    "Changes are applied directly to the document and are highlighted visually via inline or side-by-side diffs. Ending a session will keep the changes."
+                    'mode.live',
+                    "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(
                     'vs/workbench/contrib/inlineChat/common/inlineChat',
                     'mode.preview',
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'mode.live',
-                    "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."
-                )),
             ],
             tags: ['experimental']
         },
@@ -255,6 +250,33 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
             )),
             default: true,
             type: 'boolean'
+        },
+        ["inlineChat.accessibleDiffView" ]: {
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/common/inlineChat',
+                'accessibleDiffView',
+                "Whether the inline chat also renders an accessible diff viewer for its changes."
+            )),
+            default: 'auto',
+            type: 'string',
+            enum: ['auto', 'on', 'off'],
+            markdownEnumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'accessibleDiffView.auto',
+                    "The accessible diff viewer is based screen reader mode being enabled."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'accessibleDiffView.on',
+                    "The accessible diff viewer is always enabled."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'accessibleDiffView.off',
+                    "The accessible diff viewer is never enabled."
+                )),
+            ],
         }
     }
 });

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

@@ -5,7 +5,7 @@ import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/icon
 import { DisposableStore, dispose, toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
 import Severity from '../../../../base/common/severity.js';
 import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Extensions } from '../../../common/contributions.js';
@@ -27,6 +27,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 var LanguageStatus_1;
 class LanguageStatusViewModel {
     constructor(combined, dedicated) {
@@ -274,7 +275,7 @@ let LanguageStatus = class LanguageStatus {
                 })).toString())
             }, undefined, this._openerService)));
         }
-        const actionBar = ( new ActionBar(right, {}));
+        const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
         store.add(actionBar);
         let action;
         if (!isPinned) {
@@ -390,14 +391,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
-                    'reset',
-                    'Reset Language Status Interaction Counter'
-                )),
-                original: 'Reset Language Status Interaction Counter'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/languageStatus/browser/languageStatus.contribution',
+                'reset',
+                "Reset Language Status Interaction Counter"
+            )),
             category: Categories.View,
             f1: true
         });

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { Extensions } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 let ListContext = class ListContext {
+    static { this.ID = 'workbench.contrib.listContext'; }
     constructor(contextKeyService) {
         contextKeyService.createKey('listSupportsTypeNavigation', true);
         contextKeyService.createKey('listSupportsKeyboardNavigation', true);
@@ -11,5 +11,5 @@ let ListContext = class ListContext {
 ListContext = ( __decorate([
     ( __param(0, IContextKeyService))
 ], ListContext));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ListContext, 1 );
+registerWorkbenchContribution2(ListContext.ID, ListContext, 1 );
 export { ListContext };

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

@@ -171,7 +171,7 @@ function sanitize(documentContent, allowUnknownProtocols) {
         hook.dispose();
     }
 }
-async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token) {
+async function renderMarkdownDocument(text, extensionService, languageService, shouldSanitize = true, allowUnknownProtocols = false, token, settingRenderer) {
     const highlight = (code, lang, callback) => {
         if (!callback) {
             return code;
@@ -185,14 +185,18 @@ async function renderMarkdownDocument(text, extensionService, languageService, s
                 callback(null, '');
                 return;
             }
-            const languageId = languageService.getLanguageIdByLanguageName(lang);
+            const languageId = languageService.getLanguageIdByLanguageName(lang) ?? languageService.getLanguageIdByLanguageName(lang.split(/\s+|:|,|(?!^)\{|\?]/, 1)[0]);
             const html = await tokenizeToString(languageService, code, languageId);
             callback(null, `<code>${html}</code>`);
         });
         return '';
     };
+    const renderer = new marked.Renderer();
+    if (settingRenderer) {
+        renderer.html = settingRenderer.getHtmlRenderer();
+    }
     return ( new Promise((resolve, reject) => {
-        marked(text, { highlight }, (err, value) => err ? reject(err) : resolve(value));
+        marked(text, { highlight, renderer }, (err, value) => err ? reject(err) : resolve(value));
     })).then(raw => {
         if (shouldSanitize) {
             return sanitize(raw, allowUnknownProtocols);