@codingame/monaco-vscode-api 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -4,20 +4,18 @@ import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
-import '../../../../base/common/arrays.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
-import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { SaveSourceRegistry } from '../../../common/editor.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
@@ -108,12 +106,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10670,
+                10770,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10671,
+                10771,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -121,13 +119,13 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10672, "&&Save With Conflicts")) :
-                        ( localize(10673, "&&Save")),
-                    run: () => ConfirmResult.SAVE
+                        ( localize(10772, "&&Save With Conflicts")) :
+                        ( localize(10773, "&&Save")),
+                    run: () => 0
                 },
                 {
-                    label: ( localize(10674, "Do&&n't Save")),
-                    run: () => ConfirmResult.DONT_SAVE
+                    label: ( localize(10774, "Do&&n't Save")),
+                    run: () => 1
                 }
             ];
             choice = (await this.dialogService.prompt({
@@ -136,29 +134,29 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10675,
+                    10775,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10676,
+                    10776,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10677, "The merge results will be lost if you don't save them."))
-                        : ( localize(10678, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10777, "The merge results will be lost if you don't save them."))
+                        : ( localize(10778, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
-                    run: () => ConfirmResult.CANCEL
+                    run: () => 2
                 }
             })).result;
         }
         else {
-            choice = ConfirmResult.DONT_SAVE;
+            choice = 1 ;
         }
-        if (choice === ConfirmResult.SAVE) {
+        if (choice === 0 ) {
             await Promise.all(( (inputModels.map(m => m.accept()))));
         }
-        else if (choice === ConfirmResult.DONT_SAVE) {
+        else if (choice === 1 ) {
             await Promise.all(( (inputModels.map(m => m._discard()))));
         }
         else ;
@@ -170,12 +168,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10679, "Do you want to accept the merge result?")),
+                message: ( localize(10779, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10680,
+                    10780,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10681, '&&Accept Merge'))
+                primaryButton: ( localize(10781, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -200,7 +198,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10682, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10782, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -310,12 +308,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10683,
+                10783,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10684,
+                10784,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -325,60 +323,60 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10685,
+                        10785,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10686,
+                        10786,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10687, "Your changes will be lost if you don't save them."))
-                        : ( localize(10688, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10787, "Your changes will be lost if you don't save them."))
+                        : ( localize(10788, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10689, '&&Save with Conflicts'))
-                            : ( localize(10690, '&&Save')),
-                        run: () => ConfirmResult.SAVE
+                            ? ( localize(10789, '&&Save with Conflicts'))
+                            : ( localize(10790, '&&Save')),
+                        run: () => 0
                     },
                     {
-                        label: ( localize(10691, "Do&&n't Save")),
-                        run: () => ConfirmResult.DONT_SAVE
+                        label: ( localize(10791, "Do&&n't Save")),
+                        run: () => 1
                     }
                 ],
                 cancelButton: {
-                    run: () => ConfirmResult.CANCEL
+                    run: () => 2
                 }
             });
             return result;
         }
-        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
+        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10692, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10792, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10693,
+                    10793,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10694, "The files contain unhandled conflicts."))
-                        : ( localize(10695, "The file contains unhandled conflicts."))
+                        ? ( localize(10794, "The files contain unhandled conflicts."))
+                        : ( localize(10795, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10696, '&&Close with Conflicts'))
-                    : ( localize(10697, '&&Close')),
-                checkbox: { label: ( localize(10698, "Do not ask me again")) }
+                    ? ( localize(10796, '&&Close with Conflicts'))
+                    : ( localize(10797, '&&Close')),
+                checkbox: { label: ( localize(10798, "Do not ask me again")) }
             });
             if (checkboxChecked) {
-                this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);
+                this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
             }
-            return confirmed ? ConfirmResult.SAVE : ConfirmResult.CANCEL;
+            return confirmed ? 0  : 2 ;
         }
         else {
-            return ConfirmResult.SAVE;
+            return 0 ;
         }
     }
 };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,10 +1,11 @@
 import '../../../../../base/browser/dom.js';
 import '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/arrays.js';
-import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/event.js';
 import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import '../model/lineRange.js';
 import '../../../../../nls.js';
 const conflictMarkers = {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js

@@ -1,6 +1,5 @@
 import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
-import { Constants } from '../../../../../base/common/uint.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 class LineRange {
     static { this.compareByStart = compareBy(l => l.startLineNumber, numberComparator); }
@@ -87,7 +86,7 @@ class LineRange {
             this.startLineNumber,
             1,
             this.endLineNumberExclusive - 1,
-            Constants.MAX_SAFE_SMALL_INTEGER
+            1073741824
         ));
     }
     toInclusiveRangeOrEmpty() {
@@ -98,7 +97,7 @@ class LineRange {
             this.startLineNumber,
             1,
             this.endLineNumberExclusive - 1,
-            Constants.MAX_SAFE_SMALL_INTEGER
+            1073741824
         ));
     }
     intersects(lineRange) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js

@@ -1,4 +1,4 @@
-import { compareBy, numberComparator, lastOrDefault } from '../../../../../base/common/arrays.js';
+import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { findLast } from '../../../../../base/common/arraysFind.js';
 import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
@@ -78,7 +78,7 @@ class DocumentLineRangeMap {
         return ( new LineRangeMapping(containingRange, mappedRange));
     }
     get outputLineCount() {
-        const last = lastOrDefault(this.lineRangeMappings);
+        const last = this.lineRangeMappings.at(-1);
         const diff = last ? last.outputRange.endLineNumberExclusive - last.inputRange.endLineNumberExclusive : 0;
         return this.inputLineCount + diff;
     }
@@ -247,7 +247,7 @@ class DocumentRangeMap {
         ));
     }
     get outputLineCount() {
-        const last = lastOrDefault(this.rangeMappings);
+        const last = this.rangeMappings.at(-1);
         const diff = last ? last.outputRange.endLineNumber - last.inputRange.endLineNumber : 0;
         return this.inputLineCount + diff;
     }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -2,19 +2,21 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { equals, CompareResult } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/event.js';
+import '../../../../../base/common/lifecycle.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { waitForState } from '../../../../../base/common/observableInternal/utilsCancellation.js';
 import { keepObserved } from '../../../../../base/common/observableInternal/utils.js';
-import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { localize } from '../../../../../nls.js';
-import { UndoRedoElementType, UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
 import { EditorModel } from '../../../../common/editor/editorModel.js';
 import { LineRange } from './lineRange.js';
 import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapping.js';
-import { TextModelDiffs, TextModelDiffState, TextModelDiffChangeReason } from './textModelDiffs.js';
+import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from './modifiedBaseRange.js';
 let MergeEditorModel = class MergeEditorModel extends EditorModel {
@@ -74,29 +76,29 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
                 this.input2TextModelDiffs,
                 this.resultTextModelDiffs,
             ].map((s) => s.state.read(reader))));
-            if (( (states.some((s) => s === TextModelDiffState.initializing)))) {
-                return MergeEditorModelState.initializing;
+            if (( (states.some((s) => s === 1 )))) {
+                return 1 ;
             }
-            if (( (states.some((s) => s === TextModelDiffState.updating)))) {
-                return MergeEditorModelState.updating;
+            if (( (states.some((s) => s === 3 )))) {
+                return 3 ;
             }
-            return MergeEditorModelState.upToDate;
+            return 2 ;
         });
         this.inputDiffComputingState = derived(this, reader => {
             const states = ( ([
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
             ].map((s) => s.state.read(reader))));
-            if (( (states.some((s) => s === TextModelDiffState.initializing)))) {
-                return MergeEditorModelState.initializing;
+            if (( (states.some((s) => s === 1 )))) {
+                return 1 ;
             }
-            if (( (states.some((s) => s === TextModelDiffState.updating)))) {
-                return MergeEditorModelState.updating;
+            if (( (states.some((s) => s === 3 )))) {
+                return 3 ;
             }
-            return MergeEditorModelState.upToDate;
+            return 2 ;
         });
-        this.isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === MergeEditorModelState.upToDate);
-        this.onInitialized = waitForState(this.diffComputingState, state => state === MergeEditorModelState.upToDate).then(() => { });
+        this.isUpToDate = derived(this, reader => this.diffComputingState.read(reader) === 2 );
+        this.onInitialized = waitForState(this.diffComputingState, state => state === 2 ).then(() => { });
         this.firstRun = true;
         this.unhandledConflictsCount = derived(this, reader => {
             const map = this.modifiedBaseRangeResultStates.read(reader);
@@ -124,7 +126,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
                         shouldRecomputeHandledFromAccepted = true;
                     }
                     return ctx.didChange(this.resultTextModelDiffs.diffs)
-                        ? ctx.change === TextModelDiffChangeReason.textChange
+                        ? ctx.change === 1
                         : true;
                 },
             }, (reader) => {
@@ -154,7 +156,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         }
     }
     async reset() {
-        await waitForState(this.inputDiffComputingState, state => state === MergeEditorModelState.upToDate);
+        await waitForState(this.inputDiffComputingState, state => state === 2 );
         const states = this.modifiedBaseRangeResultStates.get();
         transaction(tx => {
             for (const [range, state] of states) {
@@ -382,10 +384,10 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         const dataRef = ( (new WeakRef(ModifiedBaseRangeData)));
         const modelRef = ( (new WeakRef(this)));
         this.undoRedoService.pushElement({
-            type: UndoRedoElementType.Resource,
+            type: 0 ,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize(11461, "Set Input Handled")),
+            label: ( localize(11587, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -449,7 +451,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         return chunks.join();
     }
     async getResultValueWithConflictMarkers() {
-        await waitForState(this.diffComputingState, state => state === MergeEditorModelState.upToDate);
+        await waitForState(this.diffComputingState, state => state === 2 );
         if (this.unhandledConflictsCount.get() === 0) {
             return this.resultTextModel.getValue();
         }
@@ -586,12 +588,6 @@ class ModifiedBaseRangeData {
         this.handled = derived(this, reader => this.handledInput1.read(reader) && this.handledInput2.read(reader));
     }
 }
-var MergeEditorModelState;
-( ((function(MergeEditorModelState) {
-    MergeEditorModelState[MergeEditorModelState["initializing"] = 1] = "initializing";
-    MergeEditorModelState[MergeEditorModelState["upToDate"] = 2] = "upToDate";
-    MergeEditorModelState[MergeEditorModelState["updating"] = 3] = "updating";
-})(MergeEditorModelState || (MergeEditorModelState = {}))));
 class MarkAsHandledUndoRedoElement {
     constructor(resource, mergeEditorModelRef, stateRef, input1Handled, input2Handled) {
         this.resource = resource;
@@ -600,8 +596,8 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize(11462, 'Undo Mark As Handled'));
-        this.type = UndoRedoElementType.Resource;
+        this.label = ( localize(11588, 'Undo Mark As Handled'));
+        this.type = 0 ;
     }
     redo() {
         const mergeEditorModel = this.mergeEditorModelRef.deref();
@@ -632,4 +628,4 @@ class MarkAsHandledUndoRedoElement {
         });
     }
 }
-export { MergeEditorModel, MergeEditorModelState };
+export { MergeEditorModel };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js

@@ -1,7 +1,6 @@
 import { equals, tieBreakComparators, compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { splitLines } from '../../../../../base/common/strings.js';
-import { Constants } from '../../../../../base/common/uint.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { LineRangeEdit, RangeEdit } from './editing.js';
@@ -158,7 +157,10 @@ function editsToLineRangeEdit(range, sortedEdits, textModel) {
         currentPosition = edit.range.getEndPosition();
     }
     const endsLineAfter = range.endLineNumberExclusive <= textModel.getLineCount();
-    const end = endsLineAfter ? ( new Position(range.endLineNumberExclusive, 1)) : ( new Position(range.endLineNumberExclusive - 1, Constants.MAX_SAFE_SMALL_INTEGER));
+    const end = endsLineAfter ? ( new Position(range.endLineNumberExclusive, 1)) : ( new Position(
+        range.endLineNumberExclusive - 1,
+        1073741824
+    ));
     const originalText = textModel.getValueInRange(Range.fromPositions(currentPosition, end));
     text += originalText;
     const lines = splitLines(text);
@@ -202,9 +204,9 @@ class AbstractModifiedBaseRangeState {
     }
     getInput(inputNumber) {
         if (!this.isInputIncluded(inputNumber)) {
-            return InputState.excluded;
+            return 0 ;
         }
-        return InputState.first;
+        return 1 ;
     }
 }
 class ModifiedBaseRangeStateBase extends AbstractModifiedBaseRangeState {
@@ -280,7 +282,7 @@ class ModifiedBaseRangeStateBoth extends AbstractModifiedBaseRangeState {
         return other.kind === ModifiedBaseRangeStateKind.both && this.firstInput === other.firstInput && this.smartCombination === other.smartCombination;
     }
     getInput(inputNumber) {
-        return inputNumber === this.firstInput ? InputState.first : InputState.second;
+        return inputNumber === this.firstInput ? 1  : 2 ;
     }
 }
 class ModifiedBaseRangeStateUnrecognized extends AbstractModifiedBaseRangeState {
@@ -302,11 +304,4 @@ var ModifiedBaseRangeState;
     ModifiedBaseRangeState.base = ( new ModifiedBaseRangeStateBase());
     ModifiedBaseRangeState.unrecognized = ( new ModifiedBaseRangeStateUnrecognized());
 })(ModifiedBaseRangeState || (ModifiedBaseRangeState = {})));
-var InputState;
-( (function(InputState) {
-    InputState[InputState["excluded"] = 0] = "excluded";
-    InputState[InputState["first"] = 1] = "first";
-    InputState[InputState["second"] = 2] = "second";
-    InputState[InputState["unrecognized"] = 3] = "unrecognized";
-})(InputState || (InputState = {})));
-export { AbstractModifiedBaseRangeState, InputState, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateBase, ModifiedBaseRangeStateBoth, ModifiedBaseRangeStateInput1, ModifiedBaseRangeStateInput2, ModifiedBaseRangeStateKind, ModifiedBaseRangeStateUnrecognized, getOtherInputNumber };
+export { AbstractModifiedBaseRangeState, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateBase, ModifiedBaseRangeStateBoth, ModifiedBaseRangeStateInput1, ModifiedBaseRangeStateInput2, ModifiedBaseRangeStateKind, ModifiedBaseRangeStateUnrecognized, getOtherInputNumber };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -6,10 +6,11 @@ import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
 import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
 import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
-import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/event.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
         return this._barrier.isOccupied;
@@ -20,7 +21,7 @@ class TextModelDiffs extends Disposable {
         this.textModel = textModel;
         this.diffComputer = diffComputer;
         this._recomputeCount = 0;
-        this._state = observableValue(this, TextModelDiffState.initializing);
+        this._state = observableValue(this, 1 );
         this._diffs = observableValue(this, []);
         this._barrier = ( new ReentrancyBarrier());
         this._isDisposed = false;
@@ -49,11 +50,11 @@ class TextModelDiffs extends Disposable {
     _recompute(reader) {
         this._recomputeCount++;
         const currentRecomputeIdx = this._recomputeCount;
-        if (this._state.get() === TextModelDiffState.initializing) {
+        if (this._state.get() === 1 ) {
             this._isInitializing = true;
         }
         transaction(tx => {
-            this._state.set(this._isInitializing ? TextModelDiffState.initializing : TextModelDiffState.updating, tx, TextModelDiffChangeReason.other);
+            this._state.set(this._isInitializing ? 1  : 3 , tx, 0 );
         });
         const result = this.diffComputer.computeDiff(this.baseTextModel, this.textModel, reader);
         result.then((result) => {
@@ -65,18 +66,18 @@ class TextModelDiffs extends Disposable {
             }
             transaction(tx => {
                 if (result.diffs) {
-                    this._state.set(TextModelDiffState.upToDate, tx, TextModelDiffChangeReason.textChange);
-                    this._diffs.set(result.diffs, tx, TextModelDiffChangeReason.textChange);
+                    this._state.set(2 , tx, 1 );
+                    this._diffs.set(result.diffs, tx, 1 );
                 }
                 else {
-                    this._state.set(TextModelDiffState.error, tx, TextModelDiffChangeReason.textChange);
+                    this._state.set(4 , tx, 1 );
                 }
                 this._isInitializing = false;
             });
         });
     }
     ensureUpToDate() {
-        if (this.state.get() !== TextModelDiffState.upToDate) {
+        if (this.state.get() !== 2 ) {
             throw ( new BugIndicatingError('Cannot remove diffs when the model is not up to date'));
         }
     }
@@ -99,7 +100,7 @@ class TextModelDiffs extends Disposable {
                 ? d.addOutputLineDelta(diffToRemove.inputRange.lineCount - diffToRemove.outputRange.lineCount)
                 : d));
         }
-        this._diffs.set(diffs, transaction, TextModelDiffChangeReason.other);
+        this._diffs.set(diffs, transaction, 0 );
     }
     applyEditRelativeToOriginal(edit, transaction, group) {
         this.ensureUpToDate();
@@ -133,7 +134,7 @@ class TextModelDiffs extends Disposable {
             const edits = ( new LineRangeEdit(edit.range.delta(delta), edit.newLines)).toEdits(this.textModel.getLineCount());
             this.textModel.pushEditOperations(null, edits, () => null, group);
         });
-        this._diffs.set(newDiffs, transaction, TextModelDiffChangeReason.other);
+        this._diffs.set(newDiffs, transaction, 0 );
     }
     findTouchingDiffs(baseRange) {
         return this.diffs.get().filter(d => d.inputRange.touches(baseRange));
@@ -166,16 +167,4 @@ class TextModelDiffs extends Disposable {
         return LineRange.fromLineNumbers(start, endExclusive);
     }
 }
-var TextModelDiffChangeReason;
-( (function(TextModelDiffChangeReason) {
-    TextModelDiffChangeReason[TextModelDiffChangeReason["other"] = 0] = "other";
-    TextModelDiffChangeReason[TextModelDiffChangeReason["textChange"] = 1] = "textChange";
-})(TextModelDiffChangeReason || (TextModelDiffChangeReason = {})));
-var TextModelDiffState;
-( (function(TextModelDiffState) {
-    TextModelDiffState[TextModelDiffState["initializing"] = 1] = "initializing";
-    TextModelDiffState[TextModelDiffState["upToDate"] = 2] = "upToDate";
-    TextModelDiffState[TextModelDiffState["updating"] = 3] = "updating";
-    TextModelDiffState[TextModelDiffState["error"] = 4] = "error";
-})(TextModelDiffState || (TextModelDiffState = {})));
-export { TextModelDiffChangeReason, TextModelDiffState, TextModelDiffs };
+export { TextModelDiffs };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js

@@ -2,11 +2,11 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { CompareResult, ArrayQueue } from '../../../../base/common/arrays.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/event.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 function setStyle(element, style) {
     Object.entries(style).forEach(([key, value]) => {
@@ -96,7 +96,7 @@ let PersistentStore = class PersistentStore {
     }
     get() {
         if (!this.hasValue) {
-            const value = this.storageService.get(this.key, StorageScope.PROFILE);
+            const value = this.storageService.get(this.key, 0 );
             if (value !== undefined) {
                 try {
                     this.value = JSON.parse(value);
@@ -111,7 +111,7 @@ let PersistentStore = class PersistentStore {
     }
     set(newValue) {
         this.value = newValue;
-        this.storageService.store(this.key, JSON.stringify(this.value), StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(this.key, JSON.stringify(this.value), 0 , 0 );
     }
 };
 PersistentStore = ( __decorate([