@codingame/monaco-vscode-api 16.1.1 → 17.1.0

package/vscode/src/vs/editor/browser/view/viewLayer.js

@@ -149,7 +149,8 @@ class RenderedLinesCollection {
     }
 }
 class VisibleLinesCollection {
-    constructor(_lineFactory) {
+    constructor(_viewContext, _lineFactory) {
+        this._viewContext = _viewContext;
         this._lineFactory = _lineFactory;
         this.domNode = this._createDomNode();
         this._linesCollection = ( new RenderedLinesCollection(this._lineFactory));
@@ -222,7 +223,7 @@ class VisibleLinesCollection {
     }
     renderLines(viewportData) {
         const inp = this._linesCollection._get();
-        const renderer = ( new ViewLayerRenderer(this.domNode.domNode, this._lineFactory, viewportData));
+        const renderer = ( new ViewLayerRenderer(this.domNode.domNode, this._lineFactory, viewportData, this._viewContext));
         const ctx = {
             rendLineNumberStart: inp.rendLineNumberStart,
             lines: inp.lines,
@@ -234,10 +235,11 @@ class VisibleLinesCollection {
 }
 class ViewLayerRenderer {
     static { this._ttPolicy = createTrustedTypesPolicy('editorViewLayer', { createHTML: value => value }); }
-    constructor(_domNode, _lineFactory, _viewportData) {
+    constructor(_domNode, _lineFactory, _viewportData, _viewContext) {
         this._domNode = _domNode;
         this._lineFactory = _lineFactory;
         this._viewportData = _viewportData;
+        this._viewContext = _viewContext;
     }
     render(inContext, startLineNumber, stopLineNumber, deltaTop) {
         const ctx = {
@@ -297,7 +299,7 @@ class ViewLayerRenderer {
         const lines = ctx.lines;
         for (let i = startIndex; i <= endIndex; i++) {
             const lineNumber = rendLineNumberStart + i;
-            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this._viewportData.lineHeight);
+            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this._lineHeightForLineNumber(lineNumber));
         }
     }
     _insertLinesBefore(ctx, fromLineNumber, toLineNumber, deltaTop, deltaLN) {
@@ -384,7 +386,8 @@ class ViewLayerRenderer {
                 if (lineDomNode) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
+                const renderedLineNumber = i + rendLineNumberStart;
+                const renderResult = line.renderLine(renderedLineNumber, deltaTop[i], this._lineHeightForLineNumber(renderedLineNumber), this._viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }
@@ -405,7 +408,8 @@ class ViewLayerRenderer {
                 if (wasNew[i]) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this._viewportData.lineHeight, this._viewportData, sb);
+                const renderedLineNumber = i + rendLineNumberStart;
+                const renderResult = line.renderLine(renderedLineNumber, deltaTop[i], this._lineHeightForLineNumber(renderedLineNumber), this._viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }
@@ -417,6 +421,9 @@ class ViewLayerRenderer {
             }
         }
     }
+    _lineHeightForLineNumber(lineNumber) {
+        return this._viewContext.viewLayout.getLineHeightForLineNumber(lineNumber);
+    }
 }
 
 export { RenderedLinesCollection, VisibleLinesCollection };

package/vscode/src/vs/editor/browser/view/viewOverlays.js

@@ -10,7 +10,7 @@ class ViewOverlays extends ViewPart {
         super(context);
         this._dynamicOverlays = [];
         this._isFocused = false;
-        this._visibleLines = ( new VisibleLinesCollection({
+        this._visibleLines = ( new VisibleLinesCollection(this._context, {
             createLine: () => ( new ViewOverlayLine(this._dynamicOverlays))
         }));
         this.domNode = this._visibleLines.domNode;
@@ -126,6 +126,8 @@ class ViewOverlayLine {
         sb.appendString(String(deltaTop));
         sb.appendString('px;height:');
         sb.appendString(String(lineHeight));
+        sb.appendString('px;line-height:');
+        sb.appendString(String(lineHeight));
         sb.appendString('px;">');
         sb.appendString(result);
         sb.appendString('</div>');
@@ -135,6 +137,7 @@ class ViewOverlayLine {
         if (this._domNode) {
             this._domNode.setTop(deltaTop);
             this._domNode.setHeight(lineHeight);
+            this._domNode.setLineHeight(lineHeight);
         }
     }
 }

package/vscode/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js

@@ -133,7 +133,6 @@ class Widget {
         this._fixedOverflowWidgets = options.get(EditorOption.fixedOverflowWidgets);
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
-        this._lineHeight = options.get(EditorOption.lineHeight);
         this._affinity = null;
         this._preference = [];
         this._cachedDomNodeOffsetWidth = -1;
@@ -149,7 +148,6 @@ class Widget {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(EditorOption.lineHeight);
         if (e.hasChanged(EditorOption.layoutInfo)) {
             const layoutInfo = options.get(EditorOption.layoutInfo);
             this._contentLeft = layoutInfo.contentLeft;
@@ -262,11 +260,11 @@ class Widget {
         return ( new Coordinate(topLeft.top, topLeft.left + this._contentLeft));
     }
     _getAnchorsCoordinates(ctx) {
-        const primary = getCoordinates(this._primaryAnchor.viewPosition, this._affinity, this._lineHeight);
+        const primary = getCoordinates(this._primaryAnchor.viewPosition, this._affinity);
         const secondaryViewPosition = (this._secondaryAnchor.viewPosition?.lineNumber === this._primaryAnchor.viewPosition?.lineNumber ? this._secondaryAnchor.viewPosition : null);
-        const secondary = getCoordinates(secondaryViewPosition, this._affinity, this._lineHeight);
+        const secondary = getCoordinates(secondaryViewPosition, this._affinity);
         return { primary, secondary };
-        function getCoordinates(position, affinity, lineHeight) {
+        function getCoordinates(position, affinity) {
             if (!position) {
                 return null;
             }
@@ -276,6 +274,7 @@ class Widget {
             }
             const left = (position.column === 1 && affinity === PositionAffinity.LeftOfInjectedText ? 0 : horizontalPosition.left);
             const top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.scrollTop;
+            const lineHeight = ctx.getLineHeightForLineNumber(position.lineNumber);
             return ( new AnchorCoordinate(top, left, lineHeight));
         }
     }

package/vscode/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js

@@ -303,7 +303,8 @@ class GlyphMarginWidgets extends ViewPart {
         }
         for (let i = 0; i < this._decorationGlyphsToRender.length; i++) {
             const dec = this._decorationGlyphsToRender[i];
-            const top = ctx.viewportData.relativeVerticalOffset[dec.lineNumber - ctx.viewportData.startLineNumber];
+            const decLineNumber = dec.lineNumber;
+            const top = ctx.viewportData.relativeVerticalOffset[decLineNumber - ctx.viewportData.startLineNumber];
             const left = this._glyphMarginLeft + dec.laneIndex * this._lineHeight;
             let domNode;
             if (i < this._managedDomNodes.length) {
@@ -314,12 +315,13 @@ class GlyphMarginWidgets extends ViewPart {
                 this._managedDomNodes.push(domNode);
                 this.domNode.appendChild(domNode);
             }
+            const lineHeight = this._context.viewLayout.getLineHeightForLineNumber(decLineNumber);
             domNode.setClassName(`cgmr codicon ` + dec.combinedClassName);
             domNode.setPosition(`absolute`);
             domNode.setTop(top);
             domNode.setLeft(left);
             domNode.setWidth(width);
-            domNode.setHeight(this._lineHeight);
+            domNode.setHeight(lineHeight);
         }
         while (this._managedDomNodes.length > this._decorationGlyphsToRender.length) {
             const domNode = this._managedDomNodes.pop();

package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursor.d.ts

@@ -20,7 +20,6 @@ export declare class ViewCursor {
     private readonly _domNode;
     private _cursorStyle;
     private _lineCursorWidth;
-    private _lineHeight;
     private _typicalHalfwidthCharacterWidth;
     private _isVisible;
     private _position;

package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursor.js

@@ -31,13 +31,12 @@ class ViewCursor {
         const options = this._context.configuration.options;
         const fontInfo = options.get(EditorOption.fontInfo);
         this._cursorStyle = options.get(EditorOption.effectiveCursorStyle);
-        this._lineHeight = options.get(EditorOption.lineHeight);
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._lineCursorWidth = Math.min(options.get(EditorOption.cursorWidth), this._typicalHalfwidthCharacterWidth);
         this._isVisible = true;
         this._domNode = createFastDomNode(document.createElement('div'));
         this._domNode.setClassName(`cursor ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
-        this._domNode.setHeight(this._lineHeight);
+        this._domNode.setHeight(this._context.viewLayout.getLineHeightForLineNumber(1));
         this._domNode.setTop(0);
         this._domNode.setLeft(0);
         applyFontInfo(this._domNode, fontInfo);
@@ -84,7 +83,6 @@ class ViewCursor {
         const options = this._context.configuration.options;
         const fontInfo = options.get(EditorOption.fontInfo);
         this._cursorStyle = options.get(EditorOption.effectiveCursorStyle);
-        this._lineHeight = options.get(EditorOption.lineHeight);
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._lineCursorWidth = Math.min(options.get(EditorOption.cursorWidth), this._typicalHalfwidthCharacterWidth);
         applyFontInfo(this._domNode, fontInfo);
@@ -134,12 +132,13 @@ class ViewCursor {
                 left -= paddingLeft;
             }
             const top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.bigNumbersDelta;
+            const lineHeight = this._context.viewLayout.getLineHeightForLineNumber(position.lineNumber);
             return ( new ViewCursorRenderData(
                 top,
                 left,
                 paddingLeft,
                 width,
-                this._lineHeight,
+                lineHeight,
                 textContent,
                 textContentClassName
             ));
@@ -168,9 +167,10 @@ class ViewCursor {
             textContentClassName = this._getTokenClassName(position);
         }
         let top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.bigNumbersDelta;
-        let height = this._lineHeight;
+        const lineHeight = this._context.viewLayout.getLineHeightForLineNumber(position.lineNumber);
+        let height = lineHeight;
         if (this._cursorStyle === TextEditorCursorStyle.Underline || this._cursorStyle === TextEditorCursorStyle.UnderlineThin) {
-            top += this._lineHeight - 2;
+            top += lineHeight - 2;
             height = 2;
         }
         return ( new ViewCursorRenderData(top, range.left, 0, width, height, textContent, textContentClassName));

package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLine.js

@@ -130,6 +130,8 @@ class ViewLine {
         sb.appendString(String(deltaTop));
         sb.appendString('px;height:');
         sb.appendString(String(lineHeight));
+        sb.appendString('px;line-height:');
+        sb.appendString(String(lineHeight));
         sb.appendString('px;" class="');
         sb.appendString(ViewLine.CLASS_NAME);
         sb.appendString('">');
@@ -153,6 +155,7 @@ class ViewLine {
         if (this._renderedViewLine && this._renderedViewLine.domNode) {
             this._renderedViewLine.domNode.setTop(deltaTop);
             this._renderedViewLine.domNode.setHeight(lineHeight);
+            this._renderedViewLine.domNode.setLineHeight(lineHeight);
         }
     }
     getWidth(context) {

package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLines.js

@@ -81,7 +81,7 @@ class ViewLines extends ViewPart {
         this._viewLineOptions = ( new ViewLineOptions(conf, this._context.theme.type));
         this._linesContent = linesContent;
         this._textRangeRestingSpot = document.createElement('div');
-        this._visibleLines = ( new VisibleLinesCollection({
+        this._visibleLines = ( new VisibleLinesCollection(this._context, {
             createLine: () => ( new ViewLine(viewGpuContext, this._viewLineOptions)),
         }));
         this.domNode = this._visibleLines.domNode;
@@ -327,7 +327,7 @@ class ViewLines extends ViewPart {
                 continue;
             }
             const startColumn = lineNumber === range.startLineNumber ? range.startColumn : 1;
-            const continuesInNextLine = lineNumber !== range.endLineNumber;
+            const continuesInNextLine = lineNumber !== originalEndLineNumber;
             const endColumn = continuesInNextLine ? this._context.viewModel.getLineMaxColumn(lineNumber) : range.endColumn;
             const visibleRangesForLine = this._visibleLines.getVisibleLine(lineNumber).getVisibleRangesForRange(lineNumber, startColumn, endColumn, domReadingContext);
             if (!visibleRangesForLine) {

package/vscode/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.js

@@ -392,7 +392,7 @@ let ViewLinesGpu = class ViewLinesGpu extends ViewPart {
                 continue;
             }
             const startColumn = lineNumber === range.startLineNumber ? range.startColumn : 1;
-            const continuesInNextLine = lineNumber !== range.endLineNumber;
+            const continuesInNextLine = lineNumber !== originalEndLineNumber;
             const endColumn = continuesInNextLine ? this._context.viewModel.getLineMaxColumn(lineNumber) : range.endColumn;
             const visibleRangesForLine = this._visibleRangesForLineRange(lineNumber, startColumn, endColumn);
             if (!visibleRangesForLine) {

package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.js

@@ -112,7 +112,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
         const fauxIndentLength = lineData.minColumn - 1;
         const onlyBoundary = (this._options.renderWhitespace === 'boundary');
         const onlyTrailing = (this._options.renderWhitespace === 'trailing');
-        const lineHeight = this._options.lineHeight;
+        const lineHeight = ctx.getLineHeightForLineNumber(lineNumber);
         const middotWidth = this._options.middotWidth;
         const wsmiddotWidth = this._options.wsmiddotWidth;
         const spaceWidth = this._options.spaceWidth;

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.d.ts

@@ -19,7 +19,7 @@ import * as editorCommon from "../../../common/editorCommon.js";
 import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { IAttachedView, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from "../../../common/model.js";
 import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent } from "../../../common/textModelEvents.js";
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, ModelLineHeightChangedEvent } from "../../../common/textModelEvents.js";
 import { IEditorWhitespace, IViewModel } from "../../../common/viewModel.js";
 import { ViewModel } from "../../../common/viewModel/viewModelImpl.js";
 import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
@@ -47,6 +47,8 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     readonly onDidChangeModelOptions: Event<IModelOptionsChangedEvent>;
     private readonly _onDidChangeModelDecorations;
     readonly onDidChangeModelDecorations: Event<IModelDecorationsChangedEvent>;
+    private readonly _onDidChangeLineHeight;
+    readonly onDidChangeLineHeight: Event<ModelLineHeightChangedEvent>;
     private readonly _onDidChangeModelTokens;
     readonly onDidChangeModelTokens: Event<IModelTokensChangedEvent>;
     private readonly _onDidChangeConfiguration;
@@ -179,6 +181,7 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     getTopForPosition(lineNumber: number, column: number): number;
     private static _getVerticalOffsetForPosition;
     getBottomForLineNumber(lineNumber: number, includeViewZones?: boolean): number;
+    getLineHeightForLineNumber(lineNumber: number): number;
     setHiddenAreas(ranges: IRange[], source?: unknown, forceUpdate?: boolean): void;
     getVisibleColumnFromPosition(rawPosition: IPosition): number;
     getStatusbarColumn(rawPosition: IPosition): number;
@@ -255,7 +258,7 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     getDecorationsInRange(range: Range): IModelDecoration[] | null;
     deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
     removeDecorations(decorationIds: string[]): void;
-    setDecorationsByType(description: string, decorationTypeKey: string, decorationOptions: editorCommon.IDecorationOptions[]): void;
+    setDecorationsByType(description: string, decorationTypeKey: string, decorationOptions: editorCommon.IDecorationOptions[]): readonly string[];
     setDecorationsByTypeFast(decorationTypeKey: string, ranges: IRange[]): void;
     removeDecorationsByType(decorationTypeKey: string): void;
     getLayoutInfo(): EditorLayoutInfo;

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -94,6 +94,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this.onDidChangeModelOptions = this._onDidChangeModelOptions.event;
         this._onDidChangeModelDecorations = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
         this.onDidChangeModelDecorations = this._onDidChangeModelDecorations.event;
+        this._onDidChangeLineHeight = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
+        this.onDidChangeLineHeight = this._onDidChangeLineHeight.event;
         this._onDidChangeModelTokens = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
         this.onDidChangeModelTokens = this._onDidChangeModelTokens.event;
         this._onDidChangeConfiguration = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
@@ -456,6 +458,13 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
         return CodeEditorWidget_1._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
     }
+    getLineHeightForLineNumber(lineNumber) {
+        if (!this._modelData) {
+            return -1;
+        }
+        const viewPosition = this._modelData.viewModel.coordinatesConverter.convertModelPositionToViewPosition(( new Position(lineNumber, 1)));
+        return this._modelData.viewModel.viewLayout.getLineHeightForLineNumber(viewPosition.lineNumber);
+    }
     setHiddenAreas(ranges, source, forceUpdate) {
         this._modelData?.viewModel.setHiddenAreas(( ranges.map(r => Range.lift(r))), source, forceUpdate);
     }
@@ -1021,6 +1030,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         }
         const oldDecorationsIds = this._decorationTypeKeysToIds[decorationTypeKey] || [];
         this.changeDecorations(accessor => this._decorationTypeKeysToIds[decorationTypeKey] = accessor.deltaDecorations(oldDecorationsIds, newModelDecorations));
+        return this._decorationTypeKeysToIds[decorationTypeKey] || [];
     }
     setDecorationsByTypeFast(decorationTypeKey, ranges) {
         const oldDecorationsSubTypes = this._decorationTypeSubtypes[decorationTypeKey] || {};
@@ -1224,10 +1234,11 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         const layoutInfo = options.get(EditorOption.layoutInfo);
         const top = CodeEditorWidget_1._getVerticalOffsetForPosition(this._modelData, position.lineNumber, position.column) - this.getScrollTop();
         const left = this._modelData.view.getOffsetForColumn(position.lineNumber, position.column) + layoutInfo.glyphMarginWidth + layoutInfo.lineNumbersWidth + layoutInfo.decorationsWidth - this.getScrollLeft();
+        const height = this.getLineHeightForLineNumber(position.lineNumber);
         return {
             top: top,
             left: left,
-            height: options.get(EditorOption.lineHeight)
+            height
         };
     }
     getOffsetForColumn(lineNumber, column) {
@@ -1386,6 +1397,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                 case OutgoingViewModelEventKind.ModelTokensChanged:
                     this._onDidChangeModelTokens.fire(e.event);
                     break;
+                case OutgoingViewModelEventKind.ModelLineHeightChanged:
+                    this._onDidChangeLineHeight.fire(e.event);
+                    break;
             }
         }));
         const [view, hasRealView] = this._createView(viewModel);

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

@@ -43,12 +43,14 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         this.isFocused = derived(this, reader => this.isOriginalFocused.read(reader) || this.isModifiedFocused.read(reader));
         this._argCodeEditorWidgetOptions = null;
         this._register(autorunHandleChanges({
-            createEmptyChangeSummary: () => ({}),
-            handleChange: (ctx, changeSummary) => {
-                if (ctx.didChange(_options.editorOptions)) {
-                    Object.assign(changeSummary, ctx.change.changedOptions);
+            changeTracker: {
+                createChangeSummary: () => ({}),
+                handleChange: (ctx, changeSummary) => {
+                    if (ctx.didChange(_options.editorOptions)) {
+                        Object.assign(changeSummary, ctx.change.changedOptions);
+                    }
+                    return true;
                 }
-                return true;
             }
         }, (reader, changeSummary) => {
             _options.editorOptions.read(reader);

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

@@ -24,7 +24,7 @@ export declare class DiffEditorOptions {
     readonly maxComputationTimeMs: IObservable<number>;
     readonly showMoves: IObservable<boolean>;
     readonly isInEmbeddedEditor: IObservable<boolean>;
-    readonly diffWordWrap: IObservable<"inherit" | "off" | "on">;
+    readonly diffWordWrap: IObservable<"on" | "inherit" | "off">;
     readonly originalEditable: IObservable<boolean>;
     readonly diffCodeLens: IObservable<boolean>;
     readonly accessibilityVerbose: IObservable<boolean>;

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

@@ -156,15 +156,17 @@ class MovedBlocksLinesFeature extends Disposable {
         const modifiedHasFocus = observableSignalFromEvent('modified.onDidFocusEditorWidget', e => this._editors.modified.onDidFocusEditorWidget(() => setTimeout(() => e(undefined), 0)));
         let lastChangedEditor = 'modified';
         this._register(autorunHandleChanges({
-            createEmptyChangeSummary: () => undefined,
-            handleChange: (ctx, summary) => {
-                if (ctx.didChange(originalHasFocus)) {
-                    lastChangedEditor = 'original';
+            changeTracker: {
+                createChangeSummary: () => undefined,
+                handleChange: (ctx, summary) => {
+                    if (ctx.didChange(originalHasFocus)) {
+                        lastChangedEditor = 'original';
+                    }
+                    if (ctx.didChange(modifiedHasFocus)) {
+                        lastChangedEditor = 'modified';
+                    }
+                    return true;
                 }
-                if (ctx.didChange(modifiedHasFocus)) {
-                    lastChangedEditor = 'modified';
-                }
-                return true;
             }
         }, reader => {
             originalHasFocus.read(reader);

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

@@ -112,12 +112,14 @@ function animatedObservable(targetWindow, base, store) {
     const durationMs = 300;
     let animationFrame = undefined;
     store.add(autorunHandleChanges({
-        createEmptyChangeSummary: () => ({ animate: false }),
-        handleChange: (ctx, s) => {
-            if (ctx.didChange(base)) {
-                s.animate = s.animate || ctx.change;
+        changeTracker: {
+            createChangeSummary: () => ({ animate: false }),
+            handleChange: (ctx, s) => {
+                if (ctx.didChange(base)) {
+                    s.animate = s.animate || ctx.change;
+                }
+                return true;
             }
-            return true;
         }
     }, (reader, s) => {
         if (animationFrame !== undefined) {
@@ -236,16 +238,18 @@ function applyViewZones(editor, viewZones, setIsUpdating, zoneIds) {
             setIsUpdating(false);
         }
         store.add(autorunHandleChanges({
-            createEmptyChangeSummary() {
-                return { zoneIds: [] };
-            },
-            handleChange(context, changeSummary) {
-                const id = viewZoneIdPerOnChangeObservable.get(context.changedObservable);
-                if (id !== undefined) {
-                    changeSummary.zoneIds.push(id);
-                }
-                return true;
-            },
+            changeTracker: {
+                createChangeSummary() {
+                    return { zoneIds: [] };
+                },
+                handleChange(context, changeSummary) {
+                    const id = viewZoneIdPerOnChangeObservable.get(context.changedObservable);
+                    if (id !== undefined) {
+                        changeSummary.zoneIds.push(id);
+                    }
+                    return true;
+                },
+            }
         }, (reader, changeSummary) => {
             for (const vz of curViewZones) {
                 if (vz.onChange) {

package/vscode/src/vs/editor/common/codecs/frontMatterCodec/tokens/index.d.ts

@@ -0,0 +1,5 @@
+export { FrontMatterArray } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/frontMatterCodec/tokens/frontMatterArray";
+export { FrontMatterString } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/frontMatterCodec/tokens/frontMatterString";
+export { FrontMatterBoolean } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/frontMatterCodec/tokens/frontMatterBoolean";
+export { FrontMatterToken, FrontMatterValueToken } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/frontMatterCodec/tokens/frontMatterToken";
+export { FrontMatterRecordName, FrontMatterRecordDelimiter, FrontMatterRecord, type TNameToken as TRecordNameToken, type TSpaceToken as TRecordSpaceToken, } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/frontMatterCodec/tokens/frontMatterRecord";

package/vscode/src/vs/editor/common/codecs/simpleCodec/tokens/index.d.ts

@@ -0,0 +1,20 @@
+export { At } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/at";
+export { Tab } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/tab";
+export { Dash } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/dash";
+export { Hash } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/hash";
+export { Word } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/word";
+export { Colon } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/colon";
+export { Quote } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/quote";
+export { Slash } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/slash";
+export { Space } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/space";
+export { Comma } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/comma";
+export { FormFeed } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/formFeed";
+export { DollarSign } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/dollarSign";
+export { VerticalTab } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/verticalTab";
+export { SimpleToken } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/simpleToken";
+export { DoubleQuote } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/doubleQuote";
+export { ExclamationMark } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark";
+export { type TBracket, LeftBracket, RightBracket } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/brackets";
+export { type TCurlyBrace, LeftCurlyBrace, RightCurlyBrace } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/curlyBraces";
+export { type TParenthesis, LeftParenthesis, RightParenthesis } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/parentheses";
+export { type TAngleBracket, LeftAngleBracket, RightAngleBracket } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/angleBrackets";