@codingame/monaco-vscode-api 17.2.1 → 18.0.1

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

@@ -12,20 +12,20 @@ import { IContextKeyService } from '../../../../../platform/contextkey/common/co
 import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
-import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
-import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { LineRangeSet, LineRange } from '../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit } from '../../../../common/core/textEdit.js';
+import { TextEdit } from '../../../../common/core/edits/textEdit.js';
 import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
 import { DiffEditorSash } from '../components/diffEditorSash.js';
 import { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
 import { EditorGutter } from '../utils/editorGutter.js';
-import { derived, derivedDisposable, derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { derived, derivedDisposable, derivedWithSetter } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 const emptyArr = [];
 const width = 35;

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

@@ -1,7 +1,7 @@
 import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
 import { IObservable, IReader } from "../../../../../base/common/observable.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
-import { LineRange } from "../../../../common/core/lineRange.js";
+import { LineRange } from "../../../../common/core/ranges/lineRange.js";
 import { SymbolKind } from "../../../../common/languages.js";
 import { ITextModel } from "../../../../common/model.js";
 import { DiffEditorEditors } from "../components/diffEditorEditors.js";

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

@@ -11,7 +11,7 @@ import { isDefined } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.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 { Range } from '../../../../common/core/range.js';
 import { CursorChangeReason } from '../../../../common/cursorEvents.js';
@@ -19,9 +19,10 @@ import { SymbolKinds } from '../../../../common/languages.js';
 import { observableCodeEditor } from '../../../observableCodeEditor.js';
 import { RevealPreference } from '../diffEditorViewModel.js';
 import { PlaceholderViewZone, applyObservableDecorations, ViewZoneOverlayWidget, applyStyle } from '../utils.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 { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derivedDisposable, derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 var HideUnchangedRegionsFeature_1;
 let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disposable {
@@ -80,7 +81,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             }
             return regions;
         }));
-        this.viewZones = derivedWithStore(this, (reader, store) => {
+        this.viewZones = derived(this, (reader) => {
             const modifiedOutlineSource = this._modifiedOutlineSource.read(reader);
             if (!modifiedOutlineSource) {
                 return { origViewZones: [], modViewZones: [] };
@@ -103,13 +104,13 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
                         const origVz = ( new PlaceholderViewZone(d, 12));
                         origViewZones.push(origVz);
-                        store.add(( new CompactCollapsedCodeOverlayWidget(this._editors.original, origVz, r, !sideBySide)));
+                        reader.store.add(( new CompactCollapsedCodeOverlayWidget(this._editors.original, origVz, r, !sideBySide)));
                     }
                     {
                         const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
                         const modViewZone = ( new PlaceholderViewZone(d, 12));
                         modViewZones.push(modViewZone);
-                        store.add(( new CompactCollapsedCodeOverlayWidget(this._editors.modified, modViewZone, r)));
+                        reader.store.add(( new CompactCollapsedCodeOverlayWidget(this._editors.modified, modViewZone, r)));
                     }
                 }
                 else {
@@ -117,7 +118,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         const d = derived(this, reader =>  r.getHiddenOriginalRange(reader).startLineNumber - 1);
                         const origVz = ( new PlaceholderViewZone(d, 24));
                         origViewZones.push(origVz);
-                        store.add(( new CollapsedCodeOverlayWidget(
+                        reader.store.add(( new CollapsedCodeOverlayWidget(
                             this._editors.original,
                             origVz,
                             r,
@@ -132,7 +133,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                         const d = derived(this, reader =>  r.getHiddenModifiedRange(reader).startLineNumber - 1);
                         const modViewZone = ( new PlaceholderViewZone(d, 24));
                         modViewZones.push(modViewZone);
-                        store.add(( new CollapsedCodeOverlayWidget(
+                        reader.store.add(( new CollapsedCodeOverlayWidget(
                             this._editors.modified,
                             modViewZone,
                             r,
@@ -209,7 +210,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 if (!model) {
                     return;
                 }
-                const region = model.unchangedRegions.get().find(r => r.modifiedUnchangedRange.includes(lineNumber));
+                const region = model.unchangedRegions.get().find(r => r.modifiedUnchangedRange.contains(lineNumber));
                 if (!region) {
                     return;
                 }
@@ -225,7 +226,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
                 if (!model) {
                     return;
                 }
-                const region = model.unchangedRegions.get().find(r => r.originalUnchangedRange.includes(lineNumber));
+                const region = model.unchangedRegions.get().find(r => r.originalUnchangedRange.contains(lineNumber));
                 if (!region) {
                     return;
                 }

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

@@ -9,12 +9,15 @@ import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.j
 import '../../../../../base/common/observableInternal/index.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { PlaceholderViewZone, applyViewZones, ViewZoneOverlayWidget, applyStyle } from '../utils.js';
-import { OffsetRange, OffsetRangeSet } from '../../../../common/core/offsetRange.js';
+import { OffsetRange, OffsetRangeSet } from '../../../../common/core/ranges/offsetRange.js';
 import { localize } 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';
+import { recomputeInitiallyAndOnChange } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
 class MovedBlocksLinesFeature extends Disposable {
     static { this.movedCodeBlockPadding = 4; }
@@ -31,7 +34,7 @@ class MovedBlocksLinesFeature extends Disposable {
         this.width = observableValue(this, 0);
         this._modifiedViewZonesChangedSignal = observableSignalFromEvent('modified.onDidChangeViewZones', this._editors.modified.onDidChangeViewZones);
         this._originalViewZonesChangedSignal = observableSignalFromEvent('original.onDidChangeViewZones', this._editors.original.onDidChangeViewZones);
-        this._state = derivedWithStore(this, (reader, store) => {
+        this._state = derived(this, (reader) => {
             this._element.replaceChildren();
             const model = this._diffModel.read(reader);
             const moves = model?.diff.read(reader)?.movedTexts;
@@ -93,7 +96,7 @@ class MovedBlocksLinesFeature extends Disposable {
                 g.appendChild(path);
                 const arrowRight = document.createElementNS('http://www.w3.org/2000/svg', 'polygon');
                 arrowRight.classList.add('arrow');
-                store.add(autorun(reader => {
+                reader.store.add(autorun(reader => {
                     path.classList.toggle('currentMove', line.move === model.activeMovedText.read(reader));
                     arrowRight.classList.toggle('currentMove', line.move === model.activeMovedText.read(reader));
                 }));

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

@@ -21,9 +21,10 @@ 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.service.js';
-import { observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
 var OverviewRulerFeature_1;
 let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {

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

@@ -4,13 +4,13 @@ import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { LineRangeSet, LineRange } from '../../../../common/core/lineRange.js';
+import { LineRangeSet, LineRange } from '../../../../common/core/ranges/lineRange.js';
 import { Range } from '../../../../common/core/range.js';
 import { LineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { GlyphMarginLane } from '../../../../common/model.js';
 import { localize } from '../../../../../nls.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 const emptyArr = [];
 class RevertButtonsFeature extends Disposable {

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

@@ -1,8 +1,8 @@
 import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
 import { IObservable, IReader } from "../../../../../base/common/observable.js";
 import { CodeEditorWidget } from "../../codeEditor/codeEditorWidget.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";
 export declare class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends Disposable {
     private readonly _editor;
     private readonly _domNode;

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

@@ -2,11 +2,14 @@
 import { h, reset } from '../../../../../base/browser/dom.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { LineRange } from '../../../../common/core/lineRange.js';
-import { OffsetRange } from '../../../../common/core/offsetRange.js';
-import { observableFromEvent, observableSignalFromEvent, observableSignal } from '../../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { LineRange } from '../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 
 class EditorGutter extends Disposable {
     constructor(_editor, _domNode, itemProvider) {

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

@@ -40,7 +40,7 @@ export declare class PlaceholderViewZone implements IObservableViewZone {
     private readonly _actualHeight;
     readonly actualTop: IObservable<number | undefined>;
     readonly actualHeight: IObservable<number | undefined>;
-    readonly showInHiddenAreas = true;
+    readonly showInHiddenAreas: boolean;
     get afterLineNumber(): number;
     readonly onChange?: IObservable<unknown>;
     constructor(_afterLineNumber: IObservable<number>, heightInPx: number);

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

@@ -6,9 +6,10 @@ import '../../../../base/common/observableInternal/index.js';
 import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { TextLength } from '../../../common/core/textLength.js';
-import { autorunOpts, autorunHandleChanges, autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import { TextLength } from '../../../common/core/text/textLength.js';
+import { autorunOpts, autorunHandleChanges, autorun, autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
 function joinCombine(arr1, arr2, keySelector, combine) {
     if (arr1.length === 0) {

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

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

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

@@ -11,9 +11,9 @@ export { Comma } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e
 export { FormFeed } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/formFeed";
 export { DollarSign } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/dollarSign";
 export { VerticalTab } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/verticalTab";
-export { SimpleToken } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/simpleToken";
 export { DoubleQuote } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/doubleQuote";
 export { ExclamationMark } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark";
+export { SimpleToken, SpacingToken } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/simpleToken";
 export { type TBracket, LeftBracket, RightBracket } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/brackets";
 export { type TCurlyBrace, LeftCurlyBrace, RightCurlyBrace } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/curlyBraces";
 export { type TParenthesis, LeftParenthesis, RightParenthesis } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/editor/common/codecs/simpleCodec/tokens/parentheses";

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../base/common/event.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from "./editorOptions.js";
-import { IDimension } from "../core/dimension.js";
+import { IDimension } from "../core/2d/dimension.js";
 import { MenuId } from "../../../platform/actions/common/actions.js";
 export interface IEditorConfiguration extends IDisposable {
     readonly isSimpleWidget: boolean;

package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js

@@ -1,7 +1,7 @@
 
 import { diffEditorDefaultOptions } from './diffEditor.js';
 import { editorOptionsRegistry } from './editorOptions.js';
-import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/misc/textModelDefaults.js';
 import { localize } from '../../../nls.js';
 import { ConfigurationScope, Extensions } from '../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../platform/registry/common/platform.js';