@codingame/monaco-vscode-api 17.2.1 → 18.0.1

package/vscode/src/vs/editor/browser/services/editorWorkerService.js

@@ -17,7 +17,7 @@ import { onUnexpectedError, canceled } from '../../../base/common/errors.js';
 import { ILanguageFeaturesService } from '../../common/services/languageFeatures.service.js';
 import { MovedText } from '../../common/diff/linesDiffComputer.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../common/diff/rangeMapping.js';
-import { LineRange } from '../../common/core/lineRange.js';
+import { LineRange } from '../../common/core/ranges/lineRange.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { WindowIntervalTimer } from '../../../base/browser/dom.js';
 import { WorkerTextModelSyncClient } from '../../common/services/textModelSync/textModelSync.impl.js';

package/vscode/src/vs/editor/browser/services/hoverService/hover.css

@@ -83,6 +83,10 @@
 	text-decoration: underline;
 	outline-color: var(--vscode-focusBorder);
 }
+.monaco-workbench .workbench-hover a.codicon:focus,
+.monaco-workbench .workbench-hover a.monaco-button:focus {
+	text-decoration: none;
+}
 .monaco-workbench .workbench-hover a:hover,
 .monaco-workbench .workbench-hover a:active {
 	color: var(--vscode-textLink-activeForeground);

package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.d.ts

@@ -13,7 +13,7 @@ export declare class LineNumbersOverlay extends DynamicViewOverlay {
     private _lineNumbersWidth;
     private _lastCursorModelPosition;
     private _renderResult;
-    private _activeLineNumber;
+    private _activeModelLineNumber;
     constructor(context: ViewContext);
     private _readConfig;
     dispose(): void;

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

@@ -18,7 +18,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         this._readConfig();
         this._lastCursorModelPosition = ( new Position(1, 1));
         this._renderResult = null;
-        this._activeLineNumber = 1;
+        this._activeModelLineNumber = 1;
         this._context.addEventHandler(this);
     }
     _readConfig() {
@@ -45,8 +45,8 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         const primaryViewPosition = e.selections[0].getPosition();
         this._lastCursorModelPosition = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(primaryViewPosition);
         let shouldRender = false;
-        if (this._activeLineNumber !== primaryViewPosition.lineNumber) {
-            this._activeLineNumber = primaryViewPosition.lineNumber;
+        if (this._activeModelLineNumber !== this._lastCursorModelPosition.lineNumber) {
+            this._activeModelLineNumber = this._lastCursorModelPosition.lineNumber;
             shouldRender = true;
         }
         if (this._renderLineNumbers === RenderLineNumbersType.Relative || this._renderLineNumbers === RenderLineNumbersType.Interval) {
@@ -121,6 +121,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         const output = [];
         for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
             const lineIndex = lineNumber - visibleStartLineNumber;
+            const modelLineNumber = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(( new Position(lineNumber, 1))).lineNumber;
             let renderLineNumber = this._getLineRenderLineNumber(lineNumber);
             let extraClassNames = '';
             while (decorationStartIndex < lineNoDecorations.length && lineNoDecorations[decorationStartIndex].range.endLineNumber < lineNumber) {
@@ -144,7 +145,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
                     extraClassNames += ' dimmed-line-number';
                 }
             }
-            if (lineNumber === this._activeLineNumber) {
+            if (modelLineNumber === this._activeModelLineNumber) {
                 extraClassNames += ' active-line-number';
             }
             output[lineIndex] = (`<div class="${LineNumbersOverlay.CLASS_NAME}${lineHeightClassName}${extraClassNames}" style="left:${this._lineNumbersLeft}px;width:${this._lineNumbersWidth}px;">${renderLineNumber}</div>`);

package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.d.ts

@@ -1,7 +1,7 @@
 import { FastDomNode } from "../../../../base/browser/fastDomNode.js";
 import { ViewPart } from "../../view/viewPart.js";
 import { RenderMinimap } from "../../../common/config/editorOptions.js";
-import { RGBA8 } from "../../../common/core/rgba.js";
+import { RGBA8 } from "../../../common/core/misc/rgba.js";
 import { IEditorConfiguration } from "../../../common/config/editorConfiguration.js";
 import { MinimapCharRenderer } from "./minimapCharRenderer.js";
 import { MinimapTokensColorTracker } from "../../../common/viewModel/minimapTokensColorTracker.js";

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

@@ -12,7 +12,7 @@ import { RenderedLinesCollection } from '../../view/viewLayer.js';
 import { ViewPart, PartFingerprints, PartFingerprint } from '../../view/viewPart.js';
 import { EditorOption, RenderMinimap, EditorLayoutInfoComputer, MINIMAP_GUTTER_WIDTH } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
-import { RGBA8 } from '../../../common/core/rgba.js';
+import { RGBA8 } from '../../../common/core/misc/rgba.js';
 import { ScrollType } from '../../../common/editorCommon.js';
 import { ColorId } from '../../../common/encodedTokenAttributes.js';
 import { Constants } from './minimapCharSheet.js';

package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.d.ts

@@ -1,4 +1,4 @@
-import { RGBA8 } from "../../../common/core/rgba.js";
+import { RGBA8 } from "../../../common/core/misc/rgba.js";
 export declare class MinimapCharRenderer {
     readonly scale: number;
     _minimapCharRendererBrand: void;

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

@@ -4,7 +4,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Color } from '../../../../base/common/color.js';
 import { editorRuler } from '../../../common/core/editorColorRegistry.js';
 import '../../../../base/common/observableInternal/index.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 class RulersGpu extends ViewPart {
     constructor(context, _viewGpuContext) {

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

@@ -5,10 +5,11 @@ import { isNative, isLinux } from '../../../../base/common/platform.js';
 import { RangeUtil } from './rangeUtil.js';
 import { VisibleRanges, FloatHorizontalRange } from '../../view/renderingContext.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
-import { LineRange, RenderLineInput, renderViewLine, ForeignElementType, DomPosition } from '../../../common/viewLayout/viewLineRenderer.js';
+import { RenderLineInput, renderViewLine, ForeignElementType, DomPosition } from '../../../common/viewLayout/viewLineRenderer.js';
 import { InlineDecorationType } from '../../../common/viewModel.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { EditorFontLigatures } from '../../../common/config/editorOptions.js';
+import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
 
 const canUseFastRenderedViewLine = (function () {
     if (isNative) {
@@ -97,7 +98,7 @@ class ViewLine {
                         if (!selectionsOnLine) {
                             selectionsOnLine = [];
                         }
-                        selectionsOnLine.push(( new LineRange(startColumn - 1, endColumn - 1)));
+                        selectionsOnLine.push(( new OffsetRange(startColumn - 1, endColumn - 1)));
                     }
                 }
             }

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

@@ -23,8 +23,8 @@ import { ViewportRenderStrategy } from '../../gpu/renderStrategy/viewportRenderS
 import { FullFileRenderStrategy } from '../../gpu/renderStrategy/fullFileRenderStrategy.js';
 import { MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { GlyphRasterizer } from '../../gpu/raster/glyphRasterizer.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { runOnChange } from '../../../../base/common/observableInternal/utils.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { runOnChange } from '../../../../base/common/observableInternal/utils/runOnChange.js';
 
 var GlyphStorageBufferInfo;
 (function (GlyphStorageBufferInfo) {

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

@@ -5,9 +5,9 @@ import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { firstNonWhitespaceIndex, lastNonWhitespaceIndex } from '../../../../base/common/strings.js';
 import { CharCode } from '../../../../base/common/charCode.js';
-import { LineRange } from '../../../common/viewLayout/viewLineRenderer.js';
 import { Position } from '../../../common/core/position.js';
 import { editorWhitespaces } from '../../../common/core/editorColorRegistry.js';
+import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
 
 registerCss(whitespace);
 class WhitespaceOverlay extends DynamicViewOverlay {
@@ -90,7 +90,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
                         if (!selectionsOnLine) {
                             selectionsOnLine = [];
                         }
-                        selectionsOnLine.push(( new LineRange(startColumn - 1, endColumn - 1)));
+                        selectionsOnLine.push(( new OffsetRange(startColumn - 1, endColumn - 1)));
                     }
                 }
             }
@@ -137,7 +137,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
         let maxLeft = 0;
         for (let charIndex = fauxIndentLength; charIndex < len; charIndex++) {
             const chCode = lineContent.charCodeAt(charIndex);
-            if (currentSelection && charIndex >= currentSelection.endOffset) {
+            if (currentSelection && currentSelection.endExclusive <= charIndex) {
                 currentSelectionIndex++;
                 currentSelection = selections && selections[currentSelectionIndex];
             }
@@ -161,7 +161,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
                     continue;
                 }
             }
-            if (selections && (!currentSelection || currentSelection.startOffset > charIndex || currentSelection.endOffset <= charIndex)) {
+            if (selections && !(currentSelection && currentSelection.start <= charIndex && charIndex < currentSelection.endExclusive)) {
                 continue;
             }
             const visibleRange = ctx.visibleRangeForPosition(( new Position(lineNumber, charIndex + 1)));

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

@@ -9,7 +9,7 @@ import { ICodeEditorService } from "../../services/codeEditorService.service.js"
 import { View } from "../../view.js";
 import { CodeEditorContributions } from "./codeEditorContributions.js";
 import { ConfigurationChangedEvent, EditorLayoutInfo, EditorOption, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions } from "../../../common/config/editorOptions.js";
-import { IDimension } from "../../../common/core/dimension.js";
+import { IDimension } from "../../../common/core/2d/dimension.js";
 import { IPosition, Position } from "../../../common/core/position.js";
 import { IRange, Range } from "../../../common/core/range.js";
 import { ISelection, Selection } from "../../../common/core/selection.js";
@@ -181,7 +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;
+    getLineHeightForPosition(position: IPosition): number;
     setHiddenAreas(ranges: IRange[], source?: unknown, forceUpdate?: boolean): void;
     getVisibleColumnFromPosition(rawPosition: IPosition): number;
     getStatusbarColumn(rawPosition: IPosition): number;

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

@@ -458,12 +458,15 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
         return CodeEditorWidget_1._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
     }
-    getLineHeightForLineNumber(lineNumber) {
+    getLineHeightForPosition(position) {
         if (!this._modelData) {
             return -1;
         }
-        const viewPosition = this._modelData.viewModel.coordinatesConverter.convertModelPositionToViewPosition(( new Position(lineNumber, 1)));
-        return this._modelData.viewModel.viewLayout.getLineHeightForLineNumber(viewPosition.lineNumber);
+        const viewModel = this._modelData.viewModel;
+        if (viewModel.coordinatesConverter.modelPositionIsVisible(Position.lift(position))) {
+            return viewModel.viewLayout.getLineHeightForLineNumber(position.lineNumber);
+        }
+        return 0;
     }
     setHiddenAreas(ranges, source, forceUpdate) {
         this._modelData?.viewModel.setHiddenAreas(( ranges.map(r => Range.lift(r))), source, forceUpdate);
@@ -1234,7 +1237,7 @@ 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);
+        const height = this.getLineHeightForPosition(position);
         return {
             top: top,
             left: left,
@@ -1673,7 +1676,7 @@ class EditorContextKeysManager extends Disposable {
     }
     _updateFromConfig() {
         const options = this._editor.getOptions();
-        this._tabMovesFocus.set(TabFocus.getTabFocusMode());
+        this._tabMovesFocus.set(options.get(EditorOption.tabFocusMode) || TabFocus.getTabFocusMode());
         this._editorReadonly.set(options.get(EditorOption.readOnly));
         this._inDiffEditor.set(options.get(EditorOption.inDiffEditor));
         this._editorColumnSelection.set(options.get(EditorOption.columnSelection));

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

@@ -14,8 +14,8 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { applyStyle } from '../utils.js';
 import { EditorOption, EditorFontLigatures } from '../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../common/core/lineRange.js';
-import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { LineRange } from '../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
@@ -30,9 +30,10 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import * as accessibleDiffViewer from './accessibleDiffViewer.css';
 import { toAction } from '../../../../../base/common/actions.js';
-import { transaction, observableValue, subtransaction } from '../../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(accessibleDiffViewer);
 const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(161, 'Icon for \'Insert\' in accessible diff viewer.')));
@@ -51,14 +52,14 @@ let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
         this._diffs = _diffs;
         this._models = _models;
         this._instantiationService = _instantiationService;
-        this._state = derivedWithStore(this, (reader, store) => {
+        this._state = derived(this, (reader) => {
             const visible = this._visible.read(reader);
             this._parentNode.style.visibility = visible ? 'visible' : 'hidden';
             if (!visible) {
                 return null;
             }
-            const model = store.add(this._instantiationService.createInstance(ViewModel, this._diffs, this._models, this._setVisible, this._canClose));
-            const view = store.add(this._instantiationService.createInstance(View, this._parentNode, model, this._width, this._height, this._models));
+            const model = reader.store.add(this._instantiationService.createInstance(ViewModel, this._diffs, this._models, this._setVisible, this._canClose));
+            const view = reader.store.add(this._instantiationService.createInstance(View, this._parentNode, model, this._width, this._height, this._models));
             return { model, view, };
         }).recomputeInitiallyAndOnChange(this._store);
     }

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

@@ -5,7 +5,7 @@ import { allowsTrueInlineDiffRendering } from './diffEditorViewZones/diffEditorV
 import { MovedBlocksLinesFeature } from '../features/movedBlocksLinesFeature.js';
 import { diffLineDeleteDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineAddDecorationBackground, diffWholeLineDeleteDecoration, diffWholeLineAddDecoration, diffDeleteDecorationEmpty, diffDeleteDecoration, diffAddDecorationEmpty, diffAddDecoration } from '../registrations.contribution.js';
 import { applyObservableDecorations } from '../utils.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
 class DiffEditorDecorations extends Disposable {
     constructor(_editors, _diffModel, _options, widget) {

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

@@ -31,7 +31,7 @@ export declare class DiffEditorEditors extends Disposable {
     readonly originalCursor: import("../../../../../base/common/observable.js").IObservable<Position>;
     readonly isOriginalFocused: import("../../../../../base/common/observable.js").IObservable<boolean>;
     readonly isModifiedFocused: import("../../../../../base/common/observable.js").IObservable<boolean>;
-    readonly isFocused: import("../../../../../base/common/observable.js").IObservable<boolean>;
+    readonly isFocused: import("../../../../../base/common/observable.js").IObservableWithChange<boolean, void>;
     constructor(originalEditorElement: HTMLElement, modifiedEditorElement: HTMLElement, _options: DiffEditorOptions, _argCodeEditorWidgetOptions: IDiffCodeEditorWidgetOptions, _createInnerEditor: (instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorOptions>, editorWidgetOptions: ICodeEditorWidgetOptions) => CodeEditorWidget, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _keybindingService: IKeybindingService);
     private _createLeftHandSideEditor;
     private _createRightHandSideEditor;

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

@@ -11,9 +11,9 @@ import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
-import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derivedOpts, derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { autorunHandleChanges } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
@@ -133,6 +133,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         };
         clonedOptions.inDiffEditor = true;
         clonedOptions.automaticLayout = false;
+        clonedOptions.allowVariableLineHeights = false;
         clonedOptions.scrollbar = { ...(clonedOptions.scrollbar || {}) };
         clonedOptions.folding = false;
         clonedOptions.codeLens = this._options.diffCodeLens.get();

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

@@ -2,9 +2,9 @@
 import { Sash, Orientation, SashState } from '../../../../../base/browser/ui/sash/sash.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
-import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { derivedWithSetter } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 class SashLayout {
     resetSash() {

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

@@ -15,7 +15,7 @@ import { InlineDiffDeletedCodeMargin } from './inlineDiffDeletedCodeMargin.js';
 import { RenderOptions, LineSource, renderLines } from './renderLines.js';
 import { animatedObservable, joinCombine } from '../../utils.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../common/core/lineRange.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
 import { ScrollType } from '../../../../../common/editorCommon.js';
 import { BackgroundTokenizationState } from '../../../../../common/tokenizationTextModelPart.js';
@@ -23,10 +23,10 @@ import { InlineDecoration, InlineDecorationType } from '../../../../../common/vi
 import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 import { Range } from '../../../../../common/core/range.js';
-import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import { derived, derivedWithStore } from '../../../../../../base/common/observableInternal/derived.js';
-import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
     constructor(_targetWindow, _editors, _diffModel, _options, _diffEditorWidget, _canIgnoreViewZoneUpdateEvent, _origViewZonesToIgnore, _modViewZonesToIgnore, _clipboardService, _contextMenuService) {
@@ -96,7 +96,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             return r;
         }
         const alignmentViewZonesDisposables = this._register(( new DisposableStore()));
-        this.viewZones = derivedWithStore(this, (reader, store) => {
+        this.viewZones = derived(this, (reader) => {
             alignmentViewZonesDisposables.clear();
             const alignmentsVal = alignments.read(reader) || [];
             const origViewZones = [];
@@ -246,8 +246,8 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                         function createViewZoneMarginArrow() {
                             const arrow = document.createElement('div');
                             arrow.className = 'arrow-revert-change ' + ThemeIcon.asClassName(Codicon.arrowRight);
-                            store.add(addDisposableListener(arrow, 'mousedown', e => e.stopPropagation()));
-                            store.add(addDisposableListener(arrow, 'click', e => {
+                            reader.store.add(addDisposableListener(arrow, 'mousedown', e => e.stopPropagation()));
+                            reader.store.add(addDisposableListener(arrow, 'click', e => {
                                 e.stopPropagation();
                                 _diffEditorWidget.revert(a.diff);
                             }));

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

@@ -1,7 +1,7 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { CodeEditorWidget } from "../codeEditor/codeEditorWidget.js";
 import { IEditorOptions } from "../../../common/config/editorOptions.js";
-import { IDimension } from "../../../common/core/dimension.js";
+import { IDimension } from "../../../common/core/2d/dimension.js";
 import { IPosition, Position } from "../../../common/core/position.js";
 import { IRange, Range } from "../../../common/core/range.js";
 import { ISelection, Selection } from "../../../common/core/selection.js";

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

@@ -11,37 +11,37 @@ export declare class DiffEditorOptions {
     private readonly _diffEditorWidth;
     private readonly _screenReaderMode;
     constructor(options: Readonly<IDiffEditorOptions>, _accessibilityService: IAccessibilityService);
-    readonly couldShowInlineViewBecauseOfSize: IObservable<boolean>;
-    readonly renderOverviewRuler: IObservable<boolean>;
-    readonly renderSideBySide: IObservable<boolean>;
-    readonly readOnly: IObservable<boolean | undefined>;
-    readonly shouldRenderOldRevertArrows: IObservable<boolean>;
-    readonly shouldRenderGutterMenu: IObservable<boolean>;
-    readonly renderIndicators: IObservable<boolean>;
-    readonly enableSplitViewResizing: IObservable<boolean>;
-    readonly splitViewDefaultRatio: IObservable<number>;
-    readonly ignoreTrimWhitespace: IObservable<boolean>;
-    readonly maxComputationTimeMs: IObservable<number>;
-    readonly showMoves: IObservable<boolean>;
-    readonly isInEmbeddedEditor: IObservable<boolean>;
-    readonly diffWordWrap: IObservable<"on" | "inherit" | "off">;
-    readonly originalEditable: IObservable<boolean>;
-    readonly diffCodeLens: IObservable<boolean>;
-    readonly accessibilityVerbose: IObservable<boolean>;
-    readonly diffAlgorithm: IObservable<"advanced" | "legacy">;
-    readonly showEmptyDecorations: IObservable<boolean>;
-    readonly onlyShowAccessibleDiffViewer: IObservable<boolean>;
-    readonly compactMode: IObservable<boolean>;
+    readonly couldShowInlineViewBecauseOfSize: IObservableWithChange<boolean, void>;
+    readonly renderOverviewRuler: IObservableWithChange<boolean, void>;
+    readonly renderSideBySide: IObservableWithChange<boolean, void>;
+    readonly readOnly: IObservableWithChange<boolean | undefined, void>;
+    readonly shouldRenderOldRevertArrows: IObservableWithChange<boolean, void>;
+    readonly shouldRenderGutterMenu: IObservableWithChange<boolean, void>;
+    readonly renderIndicators: IObservableWithChange<boolean, void>;
+    readonly enableSplitViewResizing: IObservableWithChange<boolean, void>;
+    readonly splitViewDefaultRatio: IObservableWithChange<number, void>;
+    readonly ignoreTrimWhitespace: IObservableWithChange<boolean, void>;
+    readonly maxComputationTimeMs: IObservableWithChange<number, void>;
+    readonly showMoves: IObservableWithChange<boolean, void>;
+    readonly isInEmbeddedEditor: IObservableWithChange<boolean, void>;
+    readonly diffWordWrap: IObservableWithChange<"on" | "inherit" | "off", void>;
+    readonly originalEditable: IObservableWithChange<boolean, void>;
+    readonly diffCodeLens: IObservableWithChange<boolean, void>;
+    readonly accessibilityVerbose: IObservableWithChange<boolean, void>;
+    readonly diffAlgorithm: IObservableWithChange<"advanced" | "legacy", void>;
+    readonly showEmptyDecorations: IObservableWithChange<boolean, void>;
+    readonly onlyShowAccessibleDiffViewer: IObservableWithChange<boolean, void>;
+    readonly compactMode: IObservableWithChange<boolean, void>;
     private readonly trueInlineDiffRenderingEnabled;
     readonly useTrueInlineDiffRendering: IObservable<boolean>;
-    readonly hideUnchangedRegions: IObservable<boolean>;
-    readonly hideUnchangedRegionsRevealLineCount: IObservable<number>;
-    readonly hideUnchangedRegionsContextLineCount: IObservable<number>;
-    readonly hideUnchangedRegionsMinimumLineCount: IObservable<number>;
+    readonly hideUnchangedRegions: IObservableWithChange<boolean, void>;
+    readonly hideUnchangedRegionsRevealLineCount: IObservableWithChange<number, void>;
+    readonly hideUnchangedRegionsContextLineCount: IObservableWithChange<number, void>;
+    readonly hideUnchangedRegionsMinimumLineCount: IObservableWithChange<number, void>;
     updateOptions(changedOptions: IDiffEditorOptions): void;
     setWidth(width: number): void;
     private readonly _model;
     setModel(model: DiffEditorViewModel | undefined): void;
     private readonly shouldRenderInlineViewInSmartMode;
-    readonly inlineViewHideOriginalLineNumbers: IObservable<boolean>;
+    readonly inlineViewHideOriginalLineNumbers: IObservableWithChange<boolean, void>;
 }

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

@@ -6,9 +6,10 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
 import { boolean, clampedInt, stringSet, clampedFloat } from '../../../common/config/editorOptions.js';
 import { allowsTrueInlineDiffRendering } from './components/diffEditorViewZones/diffEditorViewZones.js';
-import { observableFromEvent, derivedConstOnceDefined } from '../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { derivedConstOnceDefined } from '../../../../base/common/observableInternal/experimental/utils.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
 
 let DiffEditorOptions = class DiffEditorOptions {
     get editorOptions() { return this._options; }

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

@@ -1,7 +1,7 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IObservable, IReader, ISettableObservable, ITransaction } from "../../../../base/common/observable.js";
 import { IDiffProviderFactoryService } from "./diffProviderFactoryService.service.js";
-import { ISerializedLineRange, LineRange } from "../../../common/core/lineRange.js";
+import { ISerializedLineRange, LineRange } from "../../../common/core/ranges/lineRange.js";
 import { IDocumentDiff } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
 import { MovedText } from "../../../common/diff/linesDiffComputer.js";
 import { DetailedLineRangeMapping, LineRangeMapping } from "../../../common/diff/rangeMapping.js";
@@ -21,7 +21,7 @@ export declare class DiffEditorViewModel extends Disposable implements IDiffEdit
     readonly movedTextToCompare: ISettableObservable<MovedText | undefined, void>;
     private readonly _activeMovedText;
     private readonly _hoveredMovedText;
-    readonly activeMovedText: IObservable<MovedText | undefined>;
+    readonly activeMovedText: import("../../../../base/common/observable.js").IObservableWithChange<MovedText | undefined, void>;
     setActiveMovedText(movedText: MovedText | undefined): void;
     setHoveredMovedText(movedText: MovedText | undefined): void;
     private readonly _cancellationTokenSource;

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

@@ -7,7 +7,7 @@ import '../../../../base/common/observableInternal/index.js';
 import { IDiffProviderFactoryService } from './diffProviderFactoryService.service.js';
 import { filterWithPrevious } from './utils.js';
 import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
-import { LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
+import { LineRange, LineRangeSet } from '../../../common/core/ranges/lineRange.js';
 import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
 import { TextEditInfo } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
@@ -16,11 +16,13 @@ import { optimizeSequenceDiffs } from '../../../common/diff/defaultLinesDiffComp
 import { isDefined } from '../../../../base/common/types.js';
 import { groupAdjacentBy } from '../../../../base/common/arrays.js';
 import { softAssert } from '../../../../base/common/assert.js';
-import { waitForState } from '../../../../base/common/observableInternal/utilsCancellation.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { observableSignalFromEvent, observableSignal } from '../../../../base/common/observableInternal/utils.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { waitForState } from '../../../../base/common/observableInternal/utils/utilsCancellation.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
+import { transaction } from '../../../../base/common/observableInternal/transaction.js';
+import { observableSignalFromEvent } from '../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { observableSignal } from '../../../../base/common/observableInternal/observables/observableSignal.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
     setActiveMovedText(movedText) {

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

@@ -6,7 +6,7 @@ import { IContextKeyService } from "../../../../platform/contextkey/common/conte
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IEditorProgressService } from "../../../../platform/progress/common/progress.service.js";
 import { IDiffEditorOptions } from "../../../common/config/editorOptions.js";
-import { IDimension } from "../../../common/core/dimension.js";
+import { IDimension } from "../../../common/core/2d/dimension.js";
 import { Range } from "../../../common/core/range.js";
 import { IDiffComputationResult, ILineChange } from "../../../common/diff/legacyLinesDiffComputer.js";
 import { LineRangeMapping, RangeMapping } from "../../../common/diff/rangeMapping.js";

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

@@ -39,10 +39,12 @@ import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
 import { RevertButtonsFeature } from './features/revertButtonsFeature.js';
 import * as style from './style.css';
 import { ObservableElementSizeObserver, applyViewZones, applyStyle, RefCounted, translatePosition } from './utils.js';
-import { disposableObservableValue, observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived, derivedDisposable } from '../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { recomputeInitiallyAndOnChange, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { disposableObservableValue, observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived, derivedDisposable } from '../../../../base/common/observableInternal/observables/derived.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils/utils.js';
+import { subtransaction, transaction } from '../../../../base/common/observableInternal/transaction.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 registerCss(style);
 let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {

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

@@ -4,7 +4,7 @@ import '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { LineRange } from '../../../common/core/lineRange.js';
+import { LineRange } from '../../../common/core/ranges/lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';

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

@@ -23,7 +23,7 @@ export declare class DiffEditorGutter extends Disposable {
     private readonly _actions;
     private readonly _hasActions;
     private readonly _showSash;
-    readonly width: IObservable<0 | 35>;
+    readonly width: import("../../../../../base/common/observable.js").IObservableWithChange<0 | 35, void>;
     private readonly elements;
     constructor(diffEditorRoot: HTMLDivElement, _diffModel: IObservable<DiffEditorViewModel | undefined>, _editors: DiffEditorEditors, _options: DiffEditorOptions, _sashLayout: SashLayout, _boundarySashes: IObservable<IBoundarySashes | undefined>, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _menuService: IMenuService);
     computeStagedValue(mapping: DetailedLineRangeMapping): string;