@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -17,6 +17,7 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
 import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
 let MergeEditorModel = class MergeEditorModel extends EditorModel {
     constructor(base, input1, input2, resultTextModel, diffComputer, options, telemetry, languageService, undoRedoService) {
         super();
@@ -29,18 +30,18 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         this.telemetry = telemetry;
         this.languageService = languageService;
         this.undoRedoService = undoRedoService;
-        this.input1TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer)));
-        this.input2TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer)));
-        this.resultTextModelDiffs = this._register(( new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer)));
+        this.input1TextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer))));
+        this.input2TextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer))));
+        this.resultTextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer))));
         this.modifiedBaseRanges = derived(this, (reader) => {
             const input1Diffs = this.input1TextModelDiffs.diffs.read(reader);
             const input2Diffs = this.input2TextModelDiffs.diffs.read(reader);
             return ModifiedBaseRange.fromDiffs(input1Diffs, input2Diffs, this.base, this.input1.textModel, this.input2.textModel);
         });
         this.modifiedBaseRangeResultStates = derived(this, reader => {
-            const map = ( new Map(( this.modifiedBaseRanges.read(reader).map((s) => [
-                s, ( new ModifiedBaseRangeData(s))
-            ]))));
+            const map = ( (new Map( (this.modifiedBaseRanges.read(reader).map((s) => [
+                s, ( (new ModifiedBaseRangeData(s)))
+            ])))));
             return map;
         });
         this.resultSnapshot = this.resultTextModel.createSnapshot();
@@ -56,36 +57,41 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         });
         this.resultInput2Mapping = derived(this, reader => this.input2ResultMapping.read(reader).reverse());
         this.baseResultMapping = derived(this, reader => {
-            const map = ( new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1));
-            return ( new DocumentLineRangeMap(( map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
-                ? ( new LineRangeMapping(
-            m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1)))
-                : m)), map.inputLineCount));
+            const map = ( (new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1)));
+            return (
+                 (new DocumentLineRangeMap(
+                     (map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
+                        ? ( (new
+                    LineRangeMapping(m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1))))
+                        : m)),
+                    map.inputLineCount
+                ))
+            );
         });
         this.resultBaseMapping = derived(this, reader => this.baseResultMapping.read(reader).reverse());
         this.diffComputingState = derived(this, reader => {
-            const states = ( [
+            const states = ( ([
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
                 this.resultTextModelDiffs,
-            ].map((s) => s.state.read(reader)));
-            if (( states.some((s) => s === 1 ))) {
+            ].map((s) => s.state.read(reader))));
+            if (( (states.some((s) => s === 1 )))) {
                 return 1 ;
             }
-            if (( states.some((s) => s === 3 ))) {
+            if (( (states.some((s) => s === 3 )))) {
                 return 3 ;
             }
             return 2 ;
         });
         this.inputDiffComputingState = derived(this, reader => {
-            const states = ( [
+            const states = ( ([
                 this.input1TextModelDiffs,
                 this.input2TextModelDiffs,
-            ].map((s) => s.state.read(reader)));
-            if (( states.some((s) => s === 1 ))) {
+            ].map((s) => s.state.read(reader))));
+            if (( (states.some((s) => s === 1 )))) {
                 return 1 ;
             }
-            if (( states.some((s) => s === 3 ))) {
+            if (( (states.some((s) => s === 3 )))) {
                 return 3 ;
             }
             return 2 ;
@@ -103,7 +109,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             }
             return unhandledCount;
         });
-        this.hasUnhandledConflicts = ( this.unhandledConflictsCount.map(value =>  value > 0));
+        this.hasUnhandledConflicts = ( (this.unhandledConflictsCount.map(value =>  value > 0)));
         this._register(keepObserved(this.modifiedBaseRangeResultStates));
         this._register(keepObserved(this.input1ResultMapping));
         this._register(keepObserved(this.input2ResultMapping));
@@ -178,7 +184,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
                 state.handledInput2.set(handled, tx);
             }
             this.resultTextModel.pushEditOperations(null, [{
-                    range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
+                    range: ( (new Range(1, 1, Number.MAX_SAFE_INTEGER, 1))),
                     text: this.computeAutoMergedResult()
                 }], () => null);
         });
@@ -215,35 +221,42 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         return resultLines.join(this.resultTextModel.getEOL());
     }
     hasBaseRange(baseRange) {
-        return ( this.modifiedBaseRangeResultStates.get().has(baseRange));
+        return (
+             (this.modifiedBaseRangeResultStates.get().has(baseRange))
+        );
     }
     get isApplyingEditInResult() { return this.resultTextModelDiffs.isApplyingChange; }
     getInputResultMapping(inputLinesDiffs, resultDiffs, inputLineCount) {
         const map = DocumentLineRangeMap.betweenOutputs(inputLinesDiffs, resultDiffs, inputLineCount);
-        return ( new DocumentLineRangeMap(( map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
-            ? ( new LineRangeMapping(
-        m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1)))
-            : m)), map.inputLineCount));
+        return (
+             (new DocumentLineRangeMap(
+                 (map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
+                    ? ( (new
+                LineRangeMapping(m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1))))
+                    : m)),
+                map.inputLineCount
+            ))
+        );
     }
     translateInputRangeToBase(input, range) {
         const baseInputDiffs = input === 1 ? this.baseInput1Diffs.get() : this.baseInput2Diffs.get();
-        const map = ( new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0)).reverse();
+        const map = ( (new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0))).reverse();
         return map.projectRange(range).outputRange;
     }
     translateBaseRangeToInput(input, range) {
         const baseInputDiffs = input === 1 ? this.baseInput1Diffs.get() : this.baseInput2Diffs.get();
-        const map = ( new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0));
+        const map = ( (new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0)));
         return map.projectRange(range).outputRange;
     }
     getLineRangeInResult(baseRange, reader) {
         return this.resultTextModelDiffs.getResultLineRange(baseRange, reader);
     }
     translateResultRangeToBase(range) {
-        const map = ( new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0)).reverse();
+        const map = ( (new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0))).reverse();
         return map.projectRange(range).outputRange;
     }
     translateBaseRangeToResult(range) {
-        const map = ( new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0));
+        const map = ( (new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0)));
         return map.projectRange(range).outputRange;
     }
     findModifiedBaseRangesInRange(rangeInBase) {
@@ -273,9 +286,9 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         if (conflictingDiffs.length === 0) {
             return ModifiedBaseRangeState.base;
         }
-        const conflictingEdits = ( conflictingDiffs.map((d) => d.getLineEdit()));
+        const conflictingEdits = ( (conflictingDiffs.map((d) => d.getLineEdit())));
         function editsAgreeWithDiffs(diffs) {
-            return equals(conflictingEdits, ( diffs.map((d) => d.getLineEdit())), (a, b) => a.equals(b));
+            return equals(conflictingEdits, ( (diffs.map((d) => d.getLineEdit()))), (a, b) => a.equals(b));
         }
         if (editsAgreeWithDiffs(baseRange.input1Diffs)) {
             return ModifiedBaseRangeState.base.withInputValue(1, true);
@@ -304,20 +317,20 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
     getState(baseRange) {
         const existingState = this.modifiedBaseRangeResultStates.get().get(baseRange);
         if (!existingState) {
-            throw new BugIndicatingError('object must be from this instance');
+            throw ( (new BugIndicatingError('object must be from this instance')));
         }
         return existingState.accepted;
     }
     setState(baseRange, state, _markInputAsHandled, tx, _pushStackElement = false) {
         if (!this.isUpToDate.get()) {
-            throw new BugIndicatingError('Cannot set state while updating');
+            throw ( (new BugIndicatingError('Cannot set state while updating')));
         }
         const existingState = this.modifiedBaseRangeResultStates.get().get(baseRange);
         if (!existingState) {
-            throw new BugIndicatingError('object must be from this instance');
+            throw ( (new BugIndicatingError('object must be from this instance')));
         }
         const conflictingDiffs = this.resultTextModelDiffs.findTouchingDiffs(baseRange.baseRange);
-        const group = ( new UndoRedoGroup());
+        const group = ( (new UndoRedoGroup()));
         if (conflictingDiffs) {
             this.resultTextModelDiffs.removeDiffs(conflictingDiffs, tx, group);
         }
@@ -328,7 +341,13 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         const input1Handled = existingState.handledInput1.get();
         const input2Handled = existingState.handledInput2.get();
         if (!input1Handled || !input2Handled) {
-            this.undoRedoService.pushElement(( new MarkAsHandledUndoRedoElement(this.resultTextModel.uri, ( new WeakRef(this)), ( new WeakRef(existingState)), input1Handled, input2Handled)), group);
+            this.undoRedoService.pushElement(( (new MarkAsHandledUndoRedoElement(
+                this.resultTextModel.uri,
+                 (new WeakRef(this)),
+                 (new WeakRef(existingState)),
+                input1Handled,
+                input2Handled
+            ))), group);
         }
         if (edit) {
             this.resultTextModel.pushStackElement();
@@ -361,17 +380,13 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         if (state.handled.get() === handled) {
             return;
         }
-        const dataRef = ( new WeakRef(ModifiedBaseRangeData));
-        const modelRef = ( new WeakRef(this));
+        const dataRef = ( (new WeakRef(ModifiedBaseRangeData)));
+        const modelRef = ( (new WeakRef(this)));
         this.undoRedoService.pushElement({
             type: 0 ,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel',
-                'setInputHandled',
-                "Set Input Handled"
-            )),
+            label: ( localizeWithPath(_moduleId, 0, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -548,10 +563,10 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
         });
     }
 };
-MergeEditorModel = ( __decorate([
-    ( __param(7, ILanguageService)),
-    ( __param(8, IUndoRedoService))
-], MergeEditorModel));
+MergeEditorModel = ( (__decorate([
+    ( (__param(7, ILanguageService))),
+    ( (__param(8, IUndoRedoService)))
+], MergeEditorModel)));
 function arrayCount(array, predicate) {
     let count = 0;
     for (const value of array) {
@@ -580,11 +595,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localizeWithPath(
-            'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel',
-            'undoMarkAsHandled',
-            'Undo Mark As Handled'
-        ));
+        this.label = ( localizeWithPath(_moduleId, 1, 'Undo Mark As Handled'));
         this.type = 0 ;
     }
     redo() {

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

@@ -39,7 +39,7 @@ class ModifiedBaseRange {
         this.dumbInput1LineRangeEdit = null;
         this.dumbInput2LineRangeEdit = null;
         if (this.input1Diffs.length === 0 && this.input2Diffs.length === 0) {
-            throw new BugIndicatingError('must have at least one diff');
+            throw ( new BugIndicatingError('must have at least one diff'));
         }
     }
     getInputRange(inputNumber) {
@@ -80,7 +80,7 @@ class ModifiedBaseRange {
             return { edit: diffs[0].diff.getLineEdit(), effectiveState: ModifiedBaseRangeState.base.withInputValue(diffs[0].inputNumber, true, false) };
         }
         if (state.kind !== ModifiedBaseRangeStateKind.both) {
-            throw new BugIndicatingError();
+            throw ( new BugIndicatingError());
         }
         const smartCombinedEdit = state.smartCombination ? this.smartCombineInputs(state.firstInput) : this.dumbCombineInputs(state.firstInput);
         if (smartCombinedEdit) {

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

@@ -4,7 +4,7 @@ import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.j
 import { DetailedLineRangeMapping } from './mapping.js';
 import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
-import { ReentrancyBarrier } from '../utils.js';
+import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
 import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
 import '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
@@ -12,7 +12,7 @@ import { observableSignal } from '../../../../../base/common/observableInternal/
 import '../../../../../base/common/cancellation.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
-        return this._barrier.isActive;
+        return this._barrier.isOccupied;
     }
     constructor(baseTextModel, textModel, diffComputer) {
         super();
@@ -30,10 +30,10 @@ class TextModelDiffs extends Disposable {
             recomputeSignal.read(reader);
             this._recompute(reader);
         }));
-        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusive(() => {
+        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusiveOrSkip(() => {
             recomputeSignal.trigger(undefined);
         })));
-        this._register(textModel.onDidChangeContent(this._barrier.makeExclusive(() => {
+        this._register(textModel.onDidChangeContent(this._barrier.makeExclusiveOrSkip(() => {
             recomputeSignal.trigger(undefined);
         })));
         this._register(toDisposable(() => {
@@ -77,7 +77,7 @@ class TextModelDiffs extends Disposable {
     }
     ensureUpToDate() {
         if (this.state.get() !== 2 ) {
-            throw new BugIndicatingError('Cannot remove diffs when the model is not up to date');
+            throw ( new BugIndicatingError('Cannot remove diffs when the model is not up to date'));
         }
     }
     removeDiffs(diffToRemoves, transaction, group) {
@@ -89,7 +89,7 @@ class TextModelDiffs extends Disposable {
             const len = diffs.length;
             diffs = diffs.filter((d) => d !== diffToRemove);
             if (len === diffs.length) {
-                throw new BugIndicatingError();
+                throw ( new BugIndicatingError());
             }
             this._barrier.runExclusivelyOrThrow(() => {
                 const edits = diffToRemove.getReverseLineEdit().toEdits(this.textModel.getLineCount());
@@ -109,7 +109,7 @@ class TextModelDiffs extends Disposable {
         const newDiffs = ( new Array());
         for (const diff of this.diffs.get()) {
             if (diff.inputRange.touches(edit.range)) {
-                throw new BugIndicatingError('Edit must be conflict free.');
+                throw ( new BugIndicatingError('Edit must be conflict free.'));
             }
             else if (diff.inputRange.isAfter(edit.range)) {
                 if (!firstAfter) {

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

@@ -1,58 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CompareResult, ArrayQueue } from '../../../../base/common/arrays.js';
-import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/errors.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-class ReentrancyBarrier {
-    constructor() {
-        this._isActive = false;
-    }
-    get isActive() {
-        return this._isActive;
-    }
-    makeExclusive(fn) {
-        return ((...args) => {
-            if (this._isActive) {
-                return;
-            }
-            this._isActive = true;
-            try {
-                return fn(...args);
-            }
-            finally {
-                this._isActive = false;
-            }
-        });
-    }
-    runExclusively(fn) {
-        if (this._isActive) {
-            return;
-        }
-        this._isActive = true;
-        try {
-            fn();
-        }
-        finally {
-            this._isActive = false;
-        }
-    }
-    runExclusivelyOrThrow(fn) {
-        if (this._isActive) {
-            throw new BugIndicatingError();
-        }
-        this._isActive = true;
-        try {
-            fn();
-        }
-        finally {
-            this._isActive = false;
-        }
-    }
-}
 function setStyle(element, style) {
     Object.entries(style).forEach(([key, value]) => {
         element.style.setProperty(key, toSize(value));
@@ -169,4 +123,4 @@ function observableConfigValue(key, defaultValue, configurationService) {
         }
     }), () => configurationService.getValue(key) ?? defaultValue);
 }
-export { PersistentStore, ReentrancyBarrier, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, observableConfigValue, setFields, setStyle, thenIfNotDisposed };
+export { PersistentStore, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, observableConfigValue, setFields, setStyle, thenIfNotDisposed };

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,64 +1,33 @@
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const ctxIsMergeEditor = ( new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/common/mergeEditor',
- 'is',
- 'The editor is a merge editor'
-)) }));
-const ctxIsMergeResultEditor = ( new RawContextKey(
+const _moduleId = "vs/workbench/contrib/mergeEditor/common/mergeEditor";
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localizeWithPath(_moduleId, 0, 'The editor is a merge editor')) })));
+const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localizeWithPath(
-  'vs/workbench/contrib/mergeEditor/common/mergeEditor',
-  'isr',
-  'The editor is a the result editor of a merge editor.'
- )) }
-));
-const ctxMergeEditorLayout = ( new RawContextKey(
+ { type: 'boolean', description: ( localizeWithPath(_moduleId, 1, 'The editor is a the result editor of a merge editor.')) }
+)));
+const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localizeWithPath(
-  'vs/workbench/contrib/mergeEditor/common/mergeEditor',
-  'editorLayout',
-  'The layout mode of a merge editor'
- )) }
-));
-const ctxMergeEditorShowBase = ( new RawContextKey(
+ { type: 'string', description: ( localizeWithPath(_moduleId, 2, 'The layout mode of a merge editor')) }
+)));
+const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localizeWithPath(
-  'vs/workbench/contrib/mergeEditor/common/mergeEditor',
-  'showBase',
-  'If the merge editor shows the base version'
- )) }
-));
-const ctxMergeEditorShowBaseAtTop = ( new RawContextKey(
+ { type: 'boolean', description: ( localizeWithPath(_moduleId, 3, 'If the merge editor shows the base version')) }
+)));
+const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localizeWithPath(
-  'vs/workbench/contrib/mergeEditor/common/mergeEditor',
-  'showBaseAtTop',
-  'If base should be shown at the top'
- )) }
-));
-const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey(
+ { type: 'boolean', description: ( localizeWithPath(_moduleId, 4, 'If base should be shown at the top')) }
+)));
+const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localizeWithPath(
-  'vs/workbench/contrib/mergeEditor/common/mergeEditor',
-  'showNonConflictingChanges',
-  'If the merge editor shows non-conflicting changes'
- )) }
-));
-const ctxMergeBaseUri = ( new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/common/mergeEditor',
- 'baseUri',
- 'The uri of the baser of a merge editor'
-)) }));
-const ctxMergeResultUri = ( new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localizeWithPath(
- 'vs/workbench/contrib/mergeEditor/common/mergeEditor',
- 'resultUri',
- 'The uri of the result of a merge editor'
-)) }));
+ { type: 'boolean', description: ( localizeWithPath(_moduleId, 5, 'If the merge editor shows non-conflicting changes')) }
+)));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 6, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 7, 'The uri of the result of a merge editor')) })));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -1,9 +1,6 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localizeWithPath(
- 'vs/workbench/contrib/multiDiffEditor/browser/icons.contribution',
- 'multiDiffEditorLabelIcon',
- 'Icon of the multi diff editor label.'
-)));
+const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/icons.contribution";
+const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localizeWithPath(_moduleId, 0, 'Icon of the multi diff editor label.')));
 export { MultiDiffEditorIcon };