@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -0,0 +1,227 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { h, addDisposableListener, EventType } from '../../../../../base/browser/dom.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import { appendRemoveOnDispose, applyStyle } from '../utils.js';
+import { EditorGutter } from '../utils/editorGutter.js';
+import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
+import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { Range } from '../../../../common/core/range.js';
+import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
+import { TextModelText } from '../../../../common/model/textModelText.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { MenuId, IMenuService } from '../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+const emptyArr = [];
+const width = 35;
+let DiffEditorGutter = class DiffEditorGutter extends Disposable {
+    constructor(diffEditorRoot, _diffModel, _editors, _instantiationService, _contextKeyService, _menuService) {
+        super();
+        this._diffModel = _diffModel;
+        this._editors = _editors;
+        this._instantiationService = _instantiationService;
+        this._contextKeyService = _contextKeyService;
+        this._menuService = _menuService;
+        this._menu = this._register(this._menuService.createMenu(MenuId.DiffEditorHunkToolbar, this._contextKeyService));
+        this._actions = observableFromEvent(this._menu.onDidChange, () => this._menu.getActions());
+        this._hasActions = ( this._actions.map(a => a.length > 0));
+        this.width = derived(this, reader => this._hasActions.read(reader) ? width : 0);
+        this.elements = h('div.gutter@gutter', { style: { position: 'absolute', height: '100%', width: width + 'px', zIndex: '0' } }, []);
+        this._currentDiff = derived(this, (reader) => {
+            const model = this._diffModel.read(reader);
+            if (!model) {
+                return undefined;
+            }
+            const mappings = model.diff.read(reader)?.mappings;
+            const cursorPosition = this._editors.modifiedCursor.read(reader);
+            if (!cursorPosition) {
+                return undefined;
+            }
+            return mappings?.find(m => m.lineRangeMapping.modified.contains(cursorPosition.lineNumber));
+        });
+        this._selectedDiffs = derived(this, (reader) => {
+            const model = this._diffModel.read(reader);
+            const diff = model?.diff.read(reader);
+            if (!diff) {
+                return emptyArr;
+            }
+            const selections = this._editors.modifiedSelections.read(reader);
+            if (selections.every(s => s.isEmpty())) {
+                return emptyArr;
+            }
+            const selectedLineNumbers = ( new LineRangeSet(( selections.map(s => LineRange.fromRangeInclusive(s)))));
+            const selectedMappings = diff.mappings.filter(m => m.lineRangeMapping.innerChanges && selectedLineNumbers.intersects(m.lineRangeMapping.modified));
+            const result = ( selectedMappings.map(mapping => ({
+                mapping,
+                rangeMappings: mapping.lineRangeMapping.innerChanges.filter(c => ( selections.some(s => Range.areIntersecting(c.modifiedRange, s))))
+            })));
+            if (result.length === 0 || result.every(r => r.rangeMappings.length === 0)) {
+                return emptyArr;
+            }
+            return result;
+        });
+        this._register(appendRemoveOnDispose(diffEditorRoot, this.elements.root));
+        this._register(addDisposableListener(this.elements.root, 'click', () => {
+            this._editors.modified.focus();
+        }));
+        this._register(applyStyle(this.elements.root, { display: ( this._hasActions.map(a => a ? 'block' : 'none')) }));
+        this._register(( new EditorGutter(this._editors.modified, this.elements.root, {
+            getIntersectingGutterItems: (range, reader) => {
+                const model = this._diffModel.read(reader);
+                if (!model) {
+                    return [];
+                }
+                const diffs = model.diff.read(reader);
+                if (!diffs) {
+                    return [];
+                }
+                const selection = this._selectedDiffs.read(reader);
+                if (selection.length > 0) {
+                    const m = DetailedLineRangeMapping.fromRangeMappings(selection.flatMap(s => s.rangeMappings));
+                    return [
+                        ( new DiffGutterItem(
+                            m,
+                            true,
+                            MenuId.DiffEditorSelectionToolbar,
+                            undefined,
+                            model.model.original.uri,
+                            model.model.modified.uri
+                        ))
+                    ];
+                }
+                const currentDiff = this._currentDiff.read(reader);
+                return ( diffs.mappings.map(m => ( new DiffGutterItem(
+                    m.lineRangeMapping.withInnerChangesFromLineRanges(),
+                    m.lineRangeMapping === currentDiff?.lineRangeMapping,
+                    MenuId.DiffEditorHunkToolbar,
+                    undefined,
+                    model.model.original.uri,
+                    model.model.modified.uri
+                ))));
+            },
+            createView: (item, target) => {
+                return this._instantiationService.createInstance(DiffToolBar, item, target, this);
+            },
+        })));
+        this._register(addDisposableListener(this.elements.gutter, EventType.MOUSE_WHEEL, (e) => {
+            if (this._editors.modified.getOption(103 ).handleMouseWheel) {
+                this._editors.modified.delegateScrollFromMouseWheelEvent(e);
+            }
+        }, { passive: false }));
+    }
+    computeStagedValue(mapping) {
+        const c = mapping.innerChanges ?? [];
+        const edit = ( new TextEdit(( c.map(c => ( new SingleTextEdit(
+            c.originalRange,
+            this._editors.modifiedModel.get().getValueInRange(c.modifiedRange)
+        ))))));
+        const value = edit.apply(( new TextModelText(this._editors.original.getModel())));
+        return value;
+    }
+    layout(left) {
+        this.elements.gutter.style.left = left + 'px';
+    }
+};
+DiffEditorGutter = ( __decorate([
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IContextKeyService)),
+    ( __param(5, IMenuService))
+], DiffEditorGutter));
+class DiffGutterItem {
+    constructor(mapping, showAlways, menuId, rangeOverride, originalUri, modifiedUri) {
+        this.mapping = mapping;
+        this.showAlways = showAlways;
+        this.menuId = menuId;
+        this.rangeOverride = rangeOverride;
+        this.originalUri = originalUri;
+        this.modifiedUri = modifiedUri;
+    }
+    get id() { return ( this.mapping.modified.toString()); }
+    get range() { return this.rangeOverride ?? this.mapping.modified; }
+}
+let DiffToolBar = class DiffToolBar extends Disposable {
+    constructor(_item, target, gutter, instantiationService) {
+        super();
+        this._item = _item;
+        this._elements = h('div.gutterItem', { style: { height: '20px', width: '34px' } }, [
+            h('div.background@background', {}, []),
+            h('div.buttons@buttons', {}, []),
+        ]);
+        this._showAlways = ( this._item.map(this, item => item.showAlways));
+        this._menuId = ( this._item.map(this, item => item.menuId));
+        this._isSmall = observableValue(this, false);
+        this._lastItemRange = undefined;
+        this._lastViewRange = undefined;
+        const hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, { position: { hoverPosition: 1  } }));
+        this._register(appendRemoveOnDispose(target, this._elements.root));
+        this._register(autorun(reader => {
+            const showAlways = this._showAlways.read(reader);
+            this._elements.root.classList.toggle('noTransition', true);
+            this._elements.root.classList.toggle('showAlways', showAlways);
+            setTimeout(() => {
+                this._elements.root.classList.toggle('noTransition', false);
+            }, 0);
+        }));
+        this._register(autorunWithStore((reader, store) => {
+            this._elements.buttons.replaceChildren();
+            const i = store.add(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.buttons, this._menuId.read(reader), {
+                orientation: 1 ,
+                hoverDelegate,
+                toolbarOptions: {
+                    primaryGroup: g => g.startsWith('primary'),
+                },
+                overflowBehavior: { maxItems: this._isSmall.read(reader) ? 1 : 3 },
+                hiddenItemStrategy: 0 ,
+                actionRunner: ( new ActionRunnerWithContext(() => {
+                    const item = this._item.get();
+                    const mapping = item.mapping;
+                    return {
+                        mapping,
+                        originalWithModifiedChanges: gutter.computeStagedValue(mapping),
+                        originalUri: item.originalUri,
+                        modifiedUri: item.modifiedUri,
+                    };
+                })),
+                menuOptions: {
+                    shouldForwardArgs: true,
+                },
+            }));
+            store.add(i.onDidChangeMenuItems(() => {
+                if (this._lastItemRange) {
+                    this.layout(this._lastItemRange, this._lastViewRange);
+                }
+            }));
+        }));
+    }
+    layout(itemRange, viewRange) {
+        this._lastItemRange = itemRange;
+        this._lastViewRange = viewRange;
+        let itemHeight = this._elements.buttons.clientHeight;
+        this._isSmall.set(this._item.get().mapping.original.startLineNumber === 1 && itemRange.length < 30, undefined);
+        itemHeight = this._elements.buttons.clientHeight;
+        this._elements.root.style.top = itemRange.start + 'px';
+        this._elements.root.style.height = itemRange.length + 'px';
+        const middleHeight = itemRange.length / 2 - itemHeight / 2;
+        const margin = itemHeight;
+        let effectiveCheckboxTop = itemRange.start + middleHeight;
+        const preferredViewPortRange = OffsetRange.tryCreate(margin, viewRange.endExclusive - margin - itemHeight);
+        const preferredParentRange = OffsetRange.tryCreate(itemRange.start + margin, itemRange.endExclusive - itemHeight - margin);
+        if (preferredParentRange && preferredViewPortRange && preferredParentRange.start < preferredParentRange.endExclusive) {
+            effectiveCheckboxTop = preferredViewPortRange.clip(effectiveCheckboxTop);
+            effectiveCheckboxTop = preferredParentRange.clip(effectiveCheckboxTop);
+        }
+        this._elements.buttons.style.top = `${effectiveCheckboxTop - itemRange.start}px`;
+    }
+};
+DiffToolBar = ( __decorate([
+    ( __param(3, IInstantiationService))
+], DiffToolBar));
+export { DiffEditorGutter };

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

@@ -4,7 +4,11 @@ import { renderLabelWithIcons, renderIcon } from '../../../../../base/browser/ui
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
 import { derivedDisposable, derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { applyObservableDecorations, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
@@ -14,9 +18,6 @@ import { Range } from '../../../../common/core/range.js';
 import { SymbolKinds } from '../../../../common/languages.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 var HideUnchangedRegionsFeature_1;
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
     static { HideUnchangedRegionsFeature_1 = this; }
@@ -38,26 +39,28 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         });
         this._isUpdatingHiddenAreas = false;
         this._register(this._editors.original.onDidChangeCursorPosition(e => {
-            if (e.reason === 3 ) {
-                const m = this._diffModel.get();
-                transaction(tx => {
-                    for (const s of this._editors.original.getSelections() || []) {
-                        m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
-                        m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
-                    }
-                });
+            if (e.reason === 1 ) {
+                return;
             }
+            const m = this._diffModel.get();
+            transaction(tx => {
+                for (const s of this._editors.original.getSelections() || []) {
+                    m?.ensureOriginalLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
+                    m?.ensureOriginalLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
+                }
+            });
         }));
         this._register(this._editors.modified.onDidChangeCursorPosition(e => {
-            if (e.reason === 3 ) {
-                const m = this._diffModel.get();
-                transaction(tx => {
-                    for (const s of this._editors.modified.getSelections() || []) {
-                        m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
-                        m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
-                    }
-                });
+            if (e.reason === 1 ) {
+                return;
             }
+            const m = this._diffModel.get();
+            transaction(tx => {
+                for (const s of this._editors.modified.getSelections() || []) {
+                    m?.ensureModifiedLineIsVisible(s.getStartPosition().lineNumber, 0 , tx);
+                    m?.ensureModifiedLineIsVisible(s.getEndPosition().lineNumber, 0 , tx);
+                }
+            });
         }));
         const unchangedRegions = ( this._diffModel.map((m, reader) => {
             const regions = m?.unchangedRegions.read(reader) ?? [];

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

@@ -5,14 +5,15 @@ import { tieBreakComparators, compareBy, numberComparator, booleanComparator } f
 import { findMaxIdxBy } from '../../../../../base/common/arraysFind.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, observableSignalFromEvent, recomputeInitiallyAndOnChange, constObservable } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyViewZones, ViewZoneOverlayWidget, applyStyle, PlaceholderViewZone } from '../utils.js';
 import { OffsetRangeSet, OffsetRange } from '../../../../common/core/offsetRange.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { observableFromEvent, observableSignalFromEvent, recomputeInitiallyAndOnChange, constObservable } from '../../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
     constructor(_rootElement, _diffModel, _originalEditorLayoutInfo, _modifiedEditorLayoutInfo, _editors) {

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

@@ -3,14 +3,25 @@ import { h, addStandardDisposableListener, addDisposableListener, EventType } fr
 import { createFastDomNode } from '../../../../../base/browser/fastDomNode.js';
 import { ScrollbarState } from '../../../../../base/browser/ui/scrollbar/scrollbarState.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { appendRemoveOnDispose } from '../utils.js';
 import { Position } from '../../../../common/core/position.js';
 import { OverviewRulerZone } from '../../../../common/viewModel/overviewZoneManager.js';
-import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from '../../../../../platform/theme/common/colorRegistry.js';
+import '../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import { diffOverviewRulerInserted, diffInserted, defaultInsertColor, diffOverviewRulerRemoved, diffRemoved, defaultRemoveColor } from '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 var OverviewRulerFeature_1;
 let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
     static { OverviewRulerFeature_1 = this; }

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

@@ -2,12 +2,15 @@ import { h, addDisposableListener, EventType } from '../../../../../base/browser
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
 import { Range } from '../../../../common/core/range.js';
+import { LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { GlyphMarginLane } from '../../../../common/model.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 const emptyArr = [];
 class RevertButtonsFeature extends Disposable {
     constructor(_editors, _diffModel, _options, _widget) {
@@ -38,7 +41,7 @@ class RevertButtonsFeature extends Disposable {
             return result;
         });
         this._register(autorunWithStore((reader, store) => {
-            if (!this._options.shouldRenderRevertArrows.read(reader)) {
+            if (!this._options.shouldRenderOldRevertArrows.read(reader)) {
                 return;
             }
             const model = this._diffModel.read(reader);
@@ -71,7 +74,7 @@ class RevertButtonsFeature extends Disposable {
                     const btn = store.add(( new RevertButton(
                         m.lineRangeMapping.modified.startLineNumber,
                         this._widget,
-                        m.lineRangeMapping.innerChanges,
+                        m.lineRangeMapping,
                         false
                     )));
                     this._editors.modified.addGlyphMarginWidget(btn);
@@ -120,7 +123,12 @@ class RevertButton extends Disposable {
             e.preventDefault();
         }));
         this._register(addDisposableListener(this._domNode, EventType.CLICK, (e) => {
-            this._widget.revertRangeMappings(this._diffs);
+            if (this._diffs instanceof LineRangeMapping) {
+                this._widget.revert(this._diffs);
+            }
+            else {
+                this._widget.revertRangeMappings(this._diffs);
+            }
             e.stopPropagation();
             e.preventDefault();
         }));

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

@@ -2,7 +2,17 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 registerColor('diffEditor.move.border', { dark: '#8b8b8b9c', light: '#8b8b8b9c', hcDark: '#8b8b8b9c', hcLight: '#8b8b8b9c', }, ( localizeWithPath(
     'vs/editor/browser/widget/diffEditor/registrations.contribution',

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}";
+var css = ".monaco-editor .diff-hidden-lines-widget{width:100%}.monaco-editor .diff-hidden-lines{font-size:13px;height:0;line-height:14px;transform:translateY(-10px)}.monaco-editor .diff-hidden-lines .bottom.dragging,.monaco-editor .diff-hidden-lines .top.dragging,.monaco-editor .diff-hidden-lines:not(.dragging) .bottom:hover,.monaco-editor .diff-hidden-lines:not(.dragging) .top:hover{background-color:var(--vscode-focusBorder)}.monaco-editor .diff-hidden-lines .bottom,.monaco-editor .diff-hidden-lines .top{background-clip:padding-box;background-color:transparent;border-bottom:2px solid transparent;border-top:4px solid transparent;height:4px;transition:background-color .1s ease-out}.monaco-editor .diff-hidden-lines .bottom.canMoveTop:not(.canMoveBottom),.monaco-editor .diff-hidden-lines .top.canMoveTop:not(.canMoveBottom),.monaco-editor.draggingUnchangedRegion.canMoveTop:not(.canMoveBottom) *{cursor:n-resize!important}.monaco-editor .diff-hidden-lines .bottom:not(.canMoveTop).canMoveBottom,.monaco-editor .diff-hidden-lines .top:not(.canMoveTop).canMoveBottom,.monaco-editor.draggingUnchangedRegion:not(.canMoveTop).canMoveBottom *{cursor:s-resize!important}.monaco-editor .diff-hidden-lines .bottom.canMoveTop.canMoveBottom,.monaco-editor .diff-hidden-lines .top.canMoveTop.canMoveBottom,.monaco-editor.draggingUnchangedRegion.canMoveTop.canMoveBottom *{cursor:ns-resize!important}.monaco-editor .diff-hidden-lines .top{transform:translateY(4px)}.monaco-editor .diff-hidden-lines .bottom{transform:translateY(-6px)}.monaco-editor .diff-unchanged-lines{background:var(--vscode-diffEditor-unchangedCodeBackground)}.monaco-editor .noModificationsOverlay{align-items:center;background:var(--vscode-editor-background);display:flex;justify-content:center;z-index:1}.monaco-editor .diff-hidden-lines .center{background:var(--vscode-diffEditor-unchangedRegionBackground);box-shadow:inset 0 -5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow),inset 0 5px 5px -7px var(--vscode-diffEditor-unchangedRegionShadow);color:var(--vscode-diffEditor-unchangedRegionForeground);display:block;height:24px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-editor .diff-hidden-lines .center span.codicon{vertical-align:middle}.monaco-editor .diff-hidden-lines .center a:hover .codicon{color:var(--vscode-editorLink-activeForeground)!important;cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item{cursor:pointer}.monaco-editor .diff-hidden-lines div.breadcrumb-item:hover{color:var(--vscode-editorLink-activeForeground)}.monaco-editor .movedModified,.monaco-editor .movedOriginal{border:2px solid var(--vscode-diffEditor-move-border)}.monaco-editor .movedModified.currentMove,.monaco-editor .movedOriginal.currentMove{border:2px solid var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path.currentMove{stroke:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines path{pointer-events:visiblestroke}.monaco-diff-editor .moved-blocks-lines .arrow{fill:var(--vscode-diffEditor-move-border)}.monaco-diff-editor .moved-blocks-lines .arrow.currentMove{fill:var(--vscode-diffEditor-moveActive-border)}.monaco-diff-editor .moved-blocks-lines .arrow-rectangle{fill:var(--vscode-editor-background)}.monaco-diff-editor .moved-blocks-lines{pointer-events:none;position:absolute}.monaco-diff-editor .moved-blocks-lines path{fill:none;stroke:var(--vscode-diffEditor-move-border);stroke-width:2}.monaco-editor .char-delete.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-removedTextBackground);margin-left:-1px}.monaco-editor .char-insert.diff-range-empty{border-left:3px solid var(--vscode-diffEditor-insertedTextBackground)}.monaco-editor .fold-unchanged{cursor:pointer}.monaco-diff-editor .diff-moved-code-block{display:flex;justify-content:flex-end;margin-top:-4px}.monaco-diff-editor .diff-moved-code-block .action-bar .action-label.codicon{font-size:12px;height:12px;width:12px}.monaco-diff-editor .diffOverview{z-index:9}.monaco-diff-editor .diffOverview .diffViewport{z-index:10}.monaco-diff-editor.vs\t\t\t.diffOverview{background:rgba(0,0,0,.03)}.monaco-diff-editor.vs-dark\t\t.diffOverview{background:hsla(0,0%,100%,.01)}.monaco-scrollable-element.modified-in-monaco-diff-editor.vs\t\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.vs-dark\t.scrollbar{background:transparent}.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-black\t.scrollbar,.monaco-scrollable-element.modified-in-monaco-diff-editor.hc-light\t.scrollbar{background:none}.monaco-scrollable-element.modified-in-monaco-diff-editor .slider{z-index:10}.modified-in-monaco-diff-editor\t\t\t\t.slider.active{background:hsla(0,0%,67%,.4)}.modified-in-monaco-diff-editor.hc-black\t.slider.active,.modified-in-monaco-diff-editor.hc-light\t.slider.active{background:none}.monaco-diff-editor .delete-sign,.monaco-diff-editor .insert-sign,.monaco-editor .delete-sign,.monaco-editor .insert-sign{align-items:center;display:flex!important;font-size:11px!important;opacity:.7!important}.monaco-diff-editor.hc-black .delete-sign,.monaco-diff-editor.hc-black .insert-sign,.monaco-diff-editor.hc-light .delete-sign,.monaco-diff-editor.hc-light .insert-sign,.monaco-editor.hc-black .delete-sign,.monaco-editor.hc-black .insert-sign,.monaco-editor.hc-light .delete-sign,.monaco-editor.hc-light .insert-sign{opacity:1}.monaco-editor .inline-added-margin-view-zone,.monaco-editor .inline-deleted-margin-view-zone{text-align:right}.monaco-editor .arrow-revert-change{position:absolute;z-index:10}.monaco-editor .arrow-revert-change:hover{cursor:pointer}.monaco-editor .view-zones .view-lines .view-line span{display:inline-block}.monaco-editor .margin-view-zones .lightbulb-glyph:hover{cursor:pointer}.monaco-diff-editor .char-insert,.monaco-editor .char-insert{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-diff-editor .line-insert,.monaco-editor .line-insert{background-color:var(--vscode-diffEditor-insertedLineBackground,var(--vscode-diffEditor-insertedTextBackground))}.monaco-editor .char-insert,.monaco-editor .line-insert{border:1px solid var(--vscode-diffEditor-insertedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-insert,.monaco-editor.hc-black .line-insert,.monaco-editor.hc-light .char-insert,.monaco-editor.hc-light .line-insert{border-style:dashed}.monaco-editor .char-delete,.monaco-editor .line-delete{border:1px solid var(--vscode-diffEditor-removedTextBorder);box-sizing:border-box}.monaco-editor.hc-black .char-delete,.monaco-editor.hc-black .line-delete,.monaco-editor.hc-light .char-delete,.monaco-editor.hc-light .line-delete{border-style:dashed}.monaco-diff-editor .gutter-insert,.monaco-editor .gutter-insert,.monaco-editor .inline-added-margin-view-zone{background-color:var(--vscode-diffEditorGutter-insertedLineBackground,var(--vscode-diffEditor-insertedLineBackground),var(--vscode-diffEditor-insertedTextBackground))}.monaco-diff-editor .char-delete,.monaco-editor .char-delete{background-color:var(--vscode-diffEditor-removedTextBackground)}.monaco-diff-editor .line-delete,.monaco-editor .line-delete{background-color:var(--vscode-diffEditor-removedLineBackground,var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor .gutter-delete,.monaco-editor .gutter-delete,.monaco-editor .inline-deleted-margin-view-zone{background-color:var(--vscode-diffEditorGutter-removedLineBackground,var(--vscode-diffEditor-removedLineBackground),var(--vscode-diffEditor-removedTextBackground))}.monaco-diff-editor.side-by-side .editor.modified{border-left:1px solid var(--vscode-diffEditor-border);box-shadow:-6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor.side-by-side .editor.original{border-right:1px solid var(--vscode-diffEditor-border);box-shadow:6px 0 5px -5px var(--vscode-scrollbar-shadow)}.monaco-diff-editor .diffViewport{background:var(--vscode-scrollbarSlider-background)}.monaco-diff-editor .diffViewport:hover{background:var(--vscode-scrollbarSlider-hoverBackground)}.monaco-diff-editor .diffViewport:active{background:var(--vscode-scrollbarSlider-activeBackground)}.monaco-editor .diagonal-fill{background-image:linear-gradient(-45deg,var(--vscode-diffEditor-diagonalFill) 12.5%,#0000 12.5%,#0000 50%,var(--vscode-diffEditor-diagonalFill) 50%,var(--vscode-diffEditor-diagonalFill) 62.5%,#0000 62.5%,#0000 100%);background-size:8px 8px}.monaco-diff-editor .gutter{flex-grow:0;flex-shrink:0;overflow:hidden;position:relative;.gutterItem{opacity:0;transition:opacity .7s;&.showAlways{opacity:1}&.noTransition,&.showAlways{transition:none}}&:hover .gutterItem{opacity:1;transition:opacity .1s ease-in-out}.gutterItem{.background{border-left:2px solid var(--vscode-menu-border);height:100%;left:50%;position:absolute;width:1px}.buttons{align-items:center;display:flex;justify-content:center;position:absolute;width:100%;.monaco-toolbar{height:fit-content;.monaco-action-bar{line-height:1;.actions-container{background:var(--vscode-editor-background);border:1px solid var(--vscode-menu-border);border-radius:4px;width:fit-content;.action-item{&:hover{background:var(--vscode-toolbar-hoverBackground)}.action-label{padding:.5px 1px}}}}}}}}";
 n(css,{});
 export { css, css as default };

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

@@ -0,0 +1,104 @@
+import { h, reset } from '../../../../../base/browser/dom.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, observableSignalFromEvent, observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import { LineRange } from '../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../common/core/offsetRange.js';
+class EditorGutter extends Disposable {
+    constructor(_editor, _domNode, itemProvider) {
+        super();
+        this._editor = _editor;
+        this._domNode = _domNode;
+        this.itemProvider = itemProvider;
+        this.scrollTop = observableFromEvent(this._editor.onDidScrollChange, (e) =>  this._editor.getScrollTop());
+        this.isScrollTopZero = ( this.scrollTop.map((scrollTop) =>  scrollTop === 0));
+        this.modelAttached = observableFromEvent(this._editor.onDidChangeModel, (e) =>  this._editor.hasModel());
+        this.editorOnDidChangeViewZones = observableSignalFromEvent('onDidChangeViewZones', this._editor.onDidChangeViewZones);
+        this.editorOnDidContentSizeChange = observableSignalFromEvent('onDidContentSizeChange', this._editor.onDidContentSizeChange);
+        this.domNodeSizeChanged = observableSignal('domNodeSizeChanged');
+        this.views = ( new Map());
+        this._domNode.className = 'gutter monaco-editor';
+        const scrollDecoration = this._domNode.appendChild(h('div.scroll-decoration', { role: 'presentation', ariaHidden: 'true', style: { width: '100%' } })
+            .root);
+        const o = ( new ResizeObserver(() => {
+            transaction(tx => {
+                this.domNodeSizeChanged.trigger(tx);
+            });
+        }));
+        o.observe(this._domNode);
+        this._register(toDisposable(() => o.disconnect()));
+        this._register(autorun(reader => {
+            scrollDecoration.className = this.isScrollTopZero.read(reader) ? '' : 'scroll-decoration';
+        }));
+        this._register(autorun(reader =>  this.render(reader)));
+    }
+    dispose() {
+        super.dispose();
+        reset(this._domNode);
+    }
+    render(reader) {
+        if (!this.modelAttached.read(reader)) {
+            return;
+        }
+        this.domNodeSizeChanged.read(reader);
+        this.editorOnDidChangeViewZones.read(reader);
+        this.editorOnDidContentSizeChange.read(reader);
+        const scrollTop = this.scrollTop.read(reader);
+        const visibleRanges = this._editor.getVisibleRanges();
+        const unusedIds = ( new Set(( this.views.keys())));
+        const viewRange = OffsetRange.ofStartAndLength(0, this._domNode.clientHeight);
+        if (!viewRange.isEmpty) {
+            for (const visibleRange of visibleRanges) {
+                const visibleRange2 = ( new LineRange(visibleRange.startLineNumber, visibleRange.endLineNumber + 1));
+                const gutterItems = this.itemProvider.getIntersectingGutterItems(visibleRange2, reader);
+                transaction(tx => {
+                    for (const gutterItem of gutterItems) {
+                        if (!gutterItem.range.intersect(visibleRange2)) {
+                            continue;
+                        }
+                        unusedIds.delete(gutterItem.id);
+                        let view = this.views.get(gutterItem.id);
+                        if (!view) {
+                            const viewDomNode = document.createElement('div');
+                            this._domNode.appendChild(viewDomNode);
+                            const gutterItemObs = observableValue('item', gutterItem);
+                            const itemView = this.itemProvider.createView(gutterItemObs, viewDomNode);
+                            view = ( new ManagedGutterItemView(gutterItemObs, itemView, viewDomNode));
+                            this.views.set(gutterItem.id, view);
+                        }
+                        else {
+                            view.item.set(gutterItem, tx);
+                        }
+                        const top = gutterItem.range.startLineNumber <= this._editor.getModel().getLineCount()
+                            ? this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, true) - scrollTop
+                            : this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop;
+                        const bottom = gutterItem.range.isEmpty
+                            ? top
+                            : (this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
+                        const height = bottom - top;
+                        view.domNode.style.top = `${top}px`;
+                        view.domNode.style.height = `${height}px`;
+                        view.gutterItemView.layout(OffsetRange.ofStartAndLength(top, height), viewRange);
+                    }
+                });
+            }
+        }
+        for (const id of unusedIds) {
+            const view = this.views.get(id);
+            view.gutterItemView.dispose();
+            this._domNode.removeChild(view.domNode);
+            this.views.delete(id);
+        }
+    }
+}
+class ManagedGutterItemView {
+    constructor(item, gutterItemView, domNode) {
+        this.item = item;
+        this.gutterItemView = gutterItemView;
+        this.domNode = domNode;
+    }
+}
+export { EditorGutter };

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

@@ -2,13 +2,14 @@ import { findLast } from '../../../../base/common/arraysFind.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { isHotReloadEnabled, registerHotReloadHandler } from '../../../../base/common/hotReload.js';
 import { toDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorunOpts, autorun, autorunWithStore, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
+import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { LengthObj } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/length.js';
-import { autorunOpts, autorun, autorunWithStore, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { TextLength } from '../../../common/core/textLength.js';
 function joinCombine(arr1, arr2, keySelector, combine) {
     if (arr1.length === 0) {
         return arr2;
@@ -315,23 +316,15 @@ function translatePosition(posInOriginal, mappings) {
     }
     else {
         const l = lengthBetweenPositions(innerMapping.originalRange.getEndPosition(), posInOriginal);
-        return Range.fromPositions(addLength(innerMapping.modifiedRange.getEndPosition(), l));
+        return Range.fromPositions(l.addToPosition(innerMapping.modifiedRange.getEndPosition()));
     }
 }
 function lengthBetweenPositions(position1, position2) {
     if (position1.lineNumber === position2.lineNumber) {
-        return ( new LengthObj(0, position2.column - position1.column));
-    }
-    else {
-        return ( new LengthObj(position2.lineNumber - position1.lineNumber, position2.column - 1));
-    }
-}
-function addLength(position, length) {
-    if (length.lineCount === 0) {
-        return ( new Position(position.lineNumber, position.column + length.columnCount));
+        return ( new TextLength(0, position2.column - position1.column));
     }
     else {
-        return ( new Position(position.lineNumber + length.lineCount, length.columnCount + 1));
+        return ( new TextLength(position2.lineNumber - position1.lineNumber, position2.column - 1));
     }
 }
 function bindContextKey(key, service, computeValue) {