@codingame/monaco-vscode-api 22.1.9 → 23.0.1

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js

@@ -2,10 +2,12 @@
 import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
 import { applyFontInfo } from '../../../../config/domFontInfo.js';
 import { EditorOption, EditorFontLigatures } from '../../../../../common/config/editorOptions.js';
+import { Position } from '../../../../../common/core/position.js';
 import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
 import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
-import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
+import { RenderLineOutput, renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
 import { ViewLineRenderingData } from '../../../../../common/viewModel.js';
+import { getColumnOfNodeOffset } from '../../../../viewParts/viewLines/viewLine.js';
 
 const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 function renderLines(source, options, decorations, domNode, noExtra = false) {
@@ -15,6 +17,7 @@ function renderLines(source, options, decorations, domNode, noExtra = false) {
     let maxCharsPerLine = 0;
     let renderedLineCount = 0;
     const viewLineCounts = [];
+    const renderOutputs = [];
     for (let lineIndex = 0; lineIndex < source.lineTokens.length; lineIndex++) {
         const lineNumber = lineIndex + 1;
         const lineTokens = source.lineTokens[lineIndex];
@@ -24,7 +27,13 @@ function renderLines(source, options, decorations, domNode, noExtra = false) {
             let lastBreakOffset = 0;
             for (const breakOffset of lineBreakData.breakOffsets) {
                 const viewLineTokens = lineTokens.sliceAndInflate(lastBreakOffset, breakOffset, 0);
-                maxCharsPerLine = Math.max(maxCharsPerLine, renderOriginalLine(renderedLineCount, viewLineTokens, LineDecoration.extractWrapped(actualDecorations, lastBreakOffset, breakOffset), hasCharChanges, source.mightContainNonBasicASCII, source.mightContainRTL, options, sb, noExtra));
+                const result = renderOriginalLine(renderedLineCount, viewLineTokens, LineDecoration.extractWrapped(actualDecorations, lastBreakOffset, breakOffset), hasCharChanges, source.mightContainNonBasicASCII, source.mightContainRTL, options, sb, noExtra);
+                maxCharsPerLine = Math.max(maxCharsPerLine, result.maxCharWidth);
+                renderOutputs.push(( new RenderLineOutputWithOffset(
+                    result.output.characterMapping,
+                    result.output.containsForeignElements,
+                    lastBreakOffset
+                )));
                 renderedLineCount++;
                 lastBreakOffset = breakOffset;
             }
@@ -32,7 +41,9 @@ function renderLines(source, options, decorations, domNode, noExtra = false) {
         }
         else {
             viewLineCounts.push(1);
-            maxCharsPerLine = Math.max(maxCharsPerLine, renderOriginalLine(renderedLineCount, lineTokens, actualDecorations, hasCharChanges, source.mightContainNonBasicASCII, source.mightContainRTL, options, sb, noExtra));
+            const result = renderOriginalLine(renderedLineCount, lineTokens, actualDecorations, hasCharChanges, source.mightContainNonBasicASCII, source.mightContainRTL, options, sb, noExtra);
+            maxCharsPerLine = Math.max(maxCharsPerLine, result.maxCharWidth);
+            renderOutputs.push(( new RenderLineOutputWithOffset(result.output.characterMapping, result.output.containsForeignElements, 0)));
             renderedLineCount++;
         }
     }
@@ -41,11 +52,7 @@ function renderLines(source, options, decorations, domNode, noExtra = false) {
     const trustedhtml = ttPolicy ? ttPolicy.createHTML(html) : html;
     domNode.innerHTML = trustedhtml;
     const minWidthInPx = (maxCharsPerLine * options.typicalHalfwidthCharacterWidth);
-    return {
-        heightInLines: renderedLineCount,
-        minWidthInPx,
-        viewLineCounts,
-    };
+    return ( new RenderLinesResult(renderedLineCount, minWidthInPx, viewLineCounts, renderOutputs, source));
 }
 class LineSource {
     constructor(lineTokens, lineBreakData = ( lineTokens.map(t => null)), mightContainNonBasicASCII = true, mightContainRTL = true) {
@@ -125,6 +132,63 @@ class RenderOptions {
         ));
     }
 }
+class RenderLinesResult {
+    constructor(heightInLines, minWidthInPx, viewLineCounts, _renderOutputs, _source) {
+        this.heightInLines = heightInLines;
+        this.minWidthInPx = minWidthInPx;
+        this.viewLineCounts = viewLineCounts;
+        this._renderOutputs = _renderOutputs;
+        this._source = _source;
+    }
+    getModelPositionAt(domNode, offset) {
+        let viewLineElement = domNode;
+        while (viewLineElement && !viewLineElement.classList.contains('view-line')) {
+            viewLineElement = viewLineElement.parentElement;
+        }
+        if (!viewLineElement) {
+            return undefined;
+        }
+        const container = viewLineElement.parentElement;
+        if (!container) {
+            return undefined;
+        }
+        const viewLines = container.querySelectorAll('.view-line');
+        let viewLineIndex = -1;
+        for (let i = 0; i < viewLines.length; i++) {
+            if (viewLines[i] === viewLineElement) {
+                viewLineIndex = i;
+                break;
+            }
+        }
+        if (viewLineIndex === -1 || viewLineIndex >= this._renderOutputs.length) {
+            return undefined;
+        }
+        let modelLineNumber = 1;
+        let remainingViewLines = viewLineIndex;
+        for (let i = 0; i < this.viewLineCounts.length; i++) {
+            if (remainingViewLines < this.viewLineCounts[i]) {
+                modelLineNumber = i + 1;
+                break;
+            }
+            remainingViewLines -= this.viewLineCounts[i];
+        }
+        if (modelLineNumber > this._source.lineTokens.length) {
+            return undefined;
+        }
+        const renderOutput = this._renderOutputs[viewLineIndex];
+        if (!renderOutput) {
+            return undefined;
+        }
+        const column = getColumnOfNodeOffset(renderOutput.characterMapping, domNode, offset) + renderOutput.offset;
+        return ( new Position(modelLineNumber, column));
+    }
+}
+class RenderLineOutputWithOffset extends RenderLineOutput {
+    constructor(characterMapping, containsForeignElements, offset) {
+        super(characterMapping, containsForeignElements);
+        this.offset = offset;
+    }
+}
 function renderOriginalLine(viewLineIdx, lineTokens, decorations, hasCharChanges, mightContainNonBasicASCII, mightContainRTL, options, sb, noExtra) {
     sb.appendString('<div class="view-line');
     if (!noExtra && !hasCharChanges) {
@@ -165,7 +229,8 @@ function renderOriginalLine(viewLineIdx, lineTokens, decorations, hasCharChanges
         options.verticalScrollbarSize
     )), sb);
     sb.appendString('</div>');
-    return output.characterMapping.getHorizontalOffset(output.characterMapping.length);
+    const maxCharWidth = output.characterMapping.getHorizontalOffset(output.characterMapping.length);
+    return { output, maxCharWidth };
 }
 
-export { LineSource, RenderOptions, renderLines };
+export { LineSource, RenderLinesResult, RenderOptions, renderLines };

package/vscode/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.d.ts

@@ -55,7 +55,7 @@ export declare abstract class DelegatingEditor extends Disposable implements IEd
     revealRangeAtTop(range: IRange, scrollType?: ScrollType): void;
     getSupportedActions(): IEditorAction[];
     focus(): void;
-    trigger(source: string | null | undefined, handlerId: string, payload: any): void;
+    trigger(source: string | null | undefined, handlerId: string, payload: unknown): void;
     createDecorationsCollection(decorations?: IModelDeltaDecoration[]): IEditorDecorationsCollection;
-    changeDecorations(callback: (changeAccessor: IModelDecorationsChangeAccessor) => any): any;
+    changeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T): T | null;
 }

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js

@@ -14,7 +14,7 @@ registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleUseInlineViewWhenSpaceIsLimited()).desc.id,
-        title: ( localize(187, "Use Inline View When Space Is Limited")),
+        title: ( localize(185, "Use Inline View When Space Is Limited")),
         toggled: ( ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited')),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
     },
@@ -28,7 +28,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleShowMovedCodeBlocks()).desc.id,
-        title: ( localize(188, "Show Moved Code Blocks")),
+        title: ( localize(186, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -45,7 +45,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(189, "Revert Block")),
+            title: ( localize(187, "Revert Block")),
             icon: ctx.icon,
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -55,7 +55,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(190, "Revert Selection")),
+            title: ( localize(188, "Revert Selection")),
             icon: ctx.icon,
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -70,7 +70,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localize(191, "Open Accessible Diff Viewer")),
+        title: ( localize(189, "Open Accessible Diff Viewer")),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
     },
     order: 10,

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js

@@ -11,8 +11,8 @@ import { groupAdjacentBy } from '../../../../base/common/arrays.js';
 import { softAssert } from '../../../../base/common/assert.js';
 import '../../../../base/common/errors.js';
 import '../../../../base/common/strings.js';
-import '../../../common/core/text/positionToOffsetImpl.js';
 import '../../../common/core/text/textLength.js';
+import '../../../common/core/text/positionToOffsetImpl.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
 import '../../../common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js';
 import '../../../common/diff/defaultLinesDiffComputer/utils.js';

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.d.ts

@@ -32,6 +32,7 @@ export declare class DiffEditorWidget extends DelegatingEditor implements IDiffE
     private readonly _domElement;
     private readonly _parentContextKeyService;
     private readonly _parentInstantiationService;
+    private readonly _codeEditorService;
     private readonly _accessibilitySignalService;
     private readonly _editorProgressService;
     private readonly keybindingService;
@@ -56,7 +57,7 @@ export declare class DiffEditorWidget extends DelegatingEditor implements IDiffE
     private readonly _movedBlocksLinesPart;
     private readonly _gutter;
     get collapseUnchangedRegions(): boolean;
-    constructor(_domElement: HTMLElement, options: Readonly<IDiffEditorConstructionOptions>, codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions, _parentContextKeyService: IContextKeyService, _parentInstantiationService: IInstantiationService, codeEditorService: ICodeEditorService, _accessibilitySignalService: IAccessibilitySignalService, _editorProgressService: IEditorProgressService, keybindingService: IKeybindingService);
+    constructor(_domElement: HTMLElement, options: Readonly<IDiffEditorConstructionOptions>, codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions, _parentContextKeyService: IContextKeyService, _parentInstantiationService: IInstantiationService, _codeEditorService: ICodeEditorService, _accessibilitySignalService: IAccessibilitySignalService, _editorProgressService: IEditorProgressService, keybindingService: IKeybindingService);
     getViewWidth(): number;
     getContentHeight(): number;
     protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorConstructionOptions>, editorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget;

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js

@@ -53,11 +53,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
     static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH; }
     get onDidContentSizeChange() { return this._editors.onDidContentSizeChange; }
     get collapseUnchangedRegions() { return this._options.hideUnchangedRegions.get(); }
-    constructor(_domElement, options, codeEditorWidgetOptions, _parentContextKeyService, _parentInstantiationService, codeEditorService, _accessibilitySignalService, _editorProgressService, keybindingService) {
+    constructor(_domElement, options, codeEditorWidgetOptions, _parentContextKeyService, _parentInstantiationService, _codeEditorService, _accessibilitySignalService, _editorProgressService, keybindingService) {
         super();
         this._domElement = _domElement;
         this._parentContextKeyService = _parentContextKeyService;
         this._parentInstantiationService = _parentInstantiationService;
+        this._codeEditorService = _codeEditorService;
         this._accessibilitySignalService = _accessibilitySignalService;
         this._editorProgressService = _editorProgressService;
         this.keybindingService = keybindingService;
@@ -128,7 +129,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         });
         this._diffValue = ( this._diffModel.map((m, r) => m?.diff.read(r)));
         this.onDidUpdateDiff = Event.fromObservableLight(this._diffValue);
-        codeEditorService.willCreateDiffEditor();
+        this._codeEditorService.willCreateDiffEditor();
         this._contextKeyService.createKey('isInDiffEditor', true);
         this.elements.root.classList.toggle('standalone', codeEditorWidgetOptions.isStandaloneEditor || false);
         this._domElement.appendChild(this.elements.root);
@@ -205,7 +206,10 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._register(applyStyle(this.elements.modified, { visibility }));
         this._register(applyStyle(this.elements.original, { visibility }));
         this._createDiffEditorContributions();
-        codeEditorService.addDiffEditor(this);
+        this._codeEditorService.addDiffEditor(this);
+        this._register(toDisposable(() => {
+            this._codeEditorService.removeDiffEditor(this);
+        }));
         this._gutter = derivedDisposable(this, reader => {
             return this._options.shouldRenderGutterMenu.read(reader)
                 ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter), this.elements.root, this._diffModel, this._editors, this._options, this._sashLayout, this._boundarySashes)
@@ -374,12 +378,14 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         if (!model || !model.isDiffUpToDate.get()) {
             return;
         }
+        this._editors.modified.pushUndoStop();
         this._editors.modified.executeEdits('diffEditor', [
             {
                 range: diff.modified.toExclusiveRange(),
                 text: model.model.original.getValueInRange(diff.original.toExclusiveRange())
             }
         ]);
+        this._editors.modified.pushUndoStop();
     }
     revertRangeMappings(diffs) {
         const model = this._diffModel.get();
@@ -390,7 +396,9 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             range: c.modifiedRange,
             text: model.model.original.getValueInRange(c.originalRange)
         })));
+        this._editors.modified.pushUndoStop();
         this._editors.modified.executeEdits('diffEditor', changes);
+        this._editors.modified.pushUndoStop();
     }
     revertFocusedRangeMappings() {
         const model = this._diffModel.get();
@@ -411,10 +419,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         const diffsToRevert = diffs.filter(d => {
             return d.lineRangeMapping.modified.intersect(selectedRange);
         });
+        modifiedEditor.pushUndoStop();
         modifiedEditor.executeEdits('diffEditor', ( diffsToRevert.map(d => ({
             range: d.lineRangeMapping.modified.toExclusiveRange(),
             text: model.model.original.getValueInRange(d.lineRangeMapping.original.toExclusiveRange())
         }))));
+        modifiedEditor.pushUndoStop();
     }
     _goTo(diff) {
         this._editors.modified.setPosition(( new Position(diff.lineRangeMapping.modified.startLineNumber, 1)));

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -27,7 +27,7 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 var HideUnchangedRegionsFeature_1;
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
     static { HideUnchangedRegionsFeature_1 = this; }
-    static { this._breadcrumbsSourceFactory = observableValue(HideUnchangedRegionsFeature_1, () => ({
+    static { this._breadcrumbsSourceFactory = observableValue(this, () => ({
         dispose() {
         },
         getBreadcrumbItems(startRange, reader) {
@@ -156,7 +156,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
             glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
-                .appendMarkdown(( localize(192, 'Fold Unchanged Region'))),
+                .appendMarkdown(( localize(190, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
@@ -258,7 +258,7 @@ class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._register(autorun(reader => {
             if (!this._hide) {
                 const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
+                const linesHiddenText = ( localize(191, '{0} hidden lines', lineCount));
                 this._nodes.text.innerText = linesHiddenText;
             }
         }));
@@ -276,12 +276,12 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localize(194, 'Click or drag to show more above')) }),
+            h('div.top@top', { title: ( localize(192, 'Click or drag to show more above')) }),
             h('div.center@content', { style: { display: 'flex' } }, [
-                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(195, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
+                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(193, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
                 h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
             ]),
-            h('div.bottom@bottom', { title: ( localize(196, 'Click or drag to show more below')), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localize(194, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
         if (!this._hide) {
@@ -391,8 +391,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
-                const span = $('span', { title: ( localize(197, 'Double click to unfold')) }, linesHiddenText);
+                const linesHiddenText = ( localize(191, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localize(195, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -251,12 +251,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localize(
-                198,
+                196,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                199,
+                197,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
@@ -264,12 +264,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localize(
-                200,
+                198,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                201,
+                199,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1

package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js

@@ -102,8 +102,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localize(202, 'Revert Selected Changes'))
-                : ( localize(203, 'Revert Change'))
+                ? ( localize(200, 'Revert Selected Changes'))
+                : ( localize(201, 'Revert Change'))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -16,11 +16,11 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(204, 'The border color for text that got moved in the diff editor.')));
-registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(205, 'The active border color for text that got moved in the diff editor.')));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(206, 'The color of the shadow around unchanged region widgets.')));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(207, 'Line decoration for inserts in the diff editor.')));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(208, 'Line decoration for removals in the diff editor.')));
+registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(202, 'The border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(203, 'The active border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(204, 'The color of the shadow around unchanged region widgets.')));
+const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(205, 'Line decoration for inserts in the diff editor.')));
+const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(206, 'Line decoration for removals in the diff editor.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

package/vscode/src/vs/editor/browser/widget/diffEditor/style.css

@@ -426,3 +426,14 @@
 		margin: 0 4px;
 	}
 }
+
+.monaco-editor .line-delete-selectable {
+	user-select: text !important;
+	-webkit-user-select: text !important;
+	z-index: 1 !important;
+}
+
+.line-delete-selectable .view-line {
+	user-select: text !important;
+	-webkit-user-select: text !important;
+}

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/editorMarkdownCodeBlockRenderer.d.ts

@@ -0,0 +1,14 @@
+import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
+import { IMarkdownCodeBlockRenderer, IMarkdownRendererExtraOptions } from "../../../../../platform/markdown/browser/markdownRenderer.js";
+import { ILanguageService } from "../../../../common/languages/language.service.js";
+/**
+ * Renders markdown code blocks using the editor's tokenization and font settings.
+ */
+export declare class EditorMarkdownCodeBlockRenderer implements IMarkdownCodeBlockRenderer {
+    private readonly _configurationService;
+    private readonly _languageService;
+    private static _ttpTokenizer;
+    constructor(_configurationService: IConfigurationService, _languageService: ILanguageService);
+    renderCodeBlock(languageAlias: string | undefined, value: string, options: IMarkdownRendererExtraOptions): Promise<HTMLElement>;
+    private getFontInfo;
+}

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/editorMarkdownCodeBlockRenderer.js

@@ -0,0 +1,68 @@
+
+import { registerCss } from '@codingame/monaco-vscode-api/css';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { createElement, isHTMLElement } from '../../../../../base/browser/dom.js';
+import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { EditorOption } from '../../../../common/config/editorOptions.js';
+import { createBareFontInfoFromRawSettings } from '../../../../common/config/fontInfoFromSettings.js';
+import { ILanguageService } from '../../../../common/languages/language.service.js';
+import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
+import { tokenizeToString } from '../../../../common/languages/textToHtmlTokenizer.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { isCodeEditor } from '../../../editorBrowser.js';
+import * as renderedMarkdown from './renderedMarkdown.css';
+
+var EditorMarkdownCodeBlockRenderer_1;
+registerCss(renderedMarkdown);
+let EditorMarkdownCodeBlockRenderer = class EditorMarkdownCodeBlockRenderer {
+    static { EditorMarkdownCodeBlockRenderer_1 = this; }
+    static { this._ttpTokenizer = createTrustedTypesPolicy('tokenizeToString', {
+        createHTML(html) {
+            return html;
+        }
+    }); }
+    constructor(_configurationService, _languageService) {
+        this._configurationService = _configurationService;
+        this._languageService = _languageService;
+    }
+    async renderCodeBlock(languageAlias, value, options) {
+        const editor = isCodeEditor(options.context) ? options.context : undefined;
+        let languageId;
+        if (languageAlias) {
+            languageId = this._languageService.getLanguageIdByLanguageName(languageAlias);
+        }
+        else if (editor) {
+            languageId = editor.getModel()?.getLanguageId();
+        }
+        if (!languageId) {
+            languageId = PLAINTEXT_LANGUAGE_ID;
+        }
+        const html = await tokenizeToString(this._languageService, value, languageId);
+        const content = EditorMarkdownCodeBlockRenderer_1._ttpTokenizer ? EditorMarkdownCodeBlockRenderer_1._ttpTokenizer.createHTML(html) ?? html : html;
+        const root = createElement('span');
+        root.innerHTML = content;
+        const codeElement = root.querySelector('.monaco-tokenized-source');
+        if (!isHTMLElement(codeElement)) {
+            return createElement('span');
+        }
+        applyFontInfo(codeElement, this.getFontInfo(editor));
+        return root;
+    }
+    getFontInfo(editor) {
+        if (editor) {
+            return editor.getOption(EditorOption.fontInfo);
+        }
+        else {
+            return createBareFontInfoFromRawSettings({
+                fontFamily: this._configurationService.getValue('editor').fontFamily
+            }, 1);
+        }
+    }
+};
+EditorMarkdownCodeBlockRenderer = EditorMarkdownCodeBlockRenderer_1 = ( __decorate([
+    ( __param(0, IConfigurationService)),
+    ( __param(1, ILanguageService))
+], EditorMarkdownCodeBlockRenderer));
+
+export { EditorMarkdownCodeBlockRenderer };

package/vscode/src/vs/editor/common/config/editorConfiguration.d.ts

@@ -19,11 +19,11 @@ export interface IEditorConfiguration extends IDisposable {
     /**
      * The `options` have changed (quick event)
      */
-    onDidChangeFast: Event<ConfigurationChangedEvent>;
+    readonly onDidChangeFast: Event<ConfigurationChangedEvent>;
     /**
      * The `options` have changed (slow event)
      */
-    onDidChange: Event<ConfigurationChangedEvent>;
+    readonly onDidChange: Event<ConfigurationChangedEvent>;
     /**
      * Get the raw options as they were passed in to the editor
      * and merged with all calls to `updateOptions`.