@codingame/monaco-vscode-view-common-service-override 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js

@@ -11,6 +11,7 @@ import { derivedOpts, derived } from 'vscode/vscode/vs/base/common/observableInt
 import { autorunOpts, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
@@ -25,6 +26,7 @@ import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverV
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView";
 let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
     constructor(inputNumber, viewModel, instantiationService, contextMenuService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -38,9 +40,13 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             const model = viewModel.model;
             const inputNumber = this.inputNumber;
             const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
-            return ( model.modifiedBaseRanges.read(reader)
-                .filter((r) => r.getInputDiffs(this.inputNumber).length > 0 && (showNonConflictingChanges || r.isConflicting || !model.isHandled(r).read(reader)))
-                .map((baseRange, idx) => ( new ModifiedBaseRangeGutterItemModel(( idx.toString()), baseRange, inputNumber, viewModel))));
+            return (
+                 (model.modifiedBaseRanges.read(reader)
+                    .filter((r) => r.getInputDiffs(this.inputNumber).length > 0 && (showNonConflictingChanges || r.isConflicting || !model.isHandled(r).read(reader)))
+                    .map(
+                    (baseRange, idx) => ( (new ModifiedBaseRangeGutterItemModel( (idx.toString()), baseRange, inputNumber, viewModel)))
+                ))
+            );
         });
         this.decorations = derivedOpts({ debugName: `input${this.inputNumber}.decorations` }, reader => {
             const viewModel = this.viewModel.read(reader);
@@ -50,7 +56,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             const model = viewModel.model;
             const textModel = (this.inputNumber === 1 ? model.input1 : model.input2).textModel;
             const activeModifiedBaseRange = viewModel.activeModifiedBaseRange.read(reader);
-            const result = ( new Array());
+            const result = ( (new Array()));
             const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
             const showDeletionMarkers = this.showDeletionMarkers.read(reader);
             const diffWithThis = viewModel.baseCodeEditorView.read(reader) !== undefined && viewModel.baseShowDiffAgainst.read(reader) === this.inputNumber;
@@ -133,7 +139,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             return result;
         });
         this.htmlElements.root.classList.add(`input`);
-        this._register(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
+        this._register(( (new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
             getIntersectingGutterItems: (range, reader) => {
                 if (this.checkboxesVisible.read(reader)) {
                     return this.modifiedBaseRangeGutterItemInfos.read(reader);
@@ -142,8 +148,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                     return [];
                 }
             },
-            createView: (item, target) => ( new MergeConflictGutterItemView(item, target, contextMenuService)),
-        })));
+            createView: (item, target) => ( (new MergeConflictGutterItemView(item, target, contextMenuService))),
+        }))));
         this._register(createSelectionsAutorun(this, (baseRange, viewModel) => viewModel.model.translateBaseRangeToInput(this.inputNumber, baseRange)));
         this._register(instantiationService.createInstance(TitleMenu, inputNumber === 1 ? MenuId.MergeInput1Toolbar : MenuId.MergeInput2Toolbar, this.htmlElements.toolbar));
         this._register(autorunOpts({ debugName: `input${this.inputNumber}: update labels & text model` }, reader => {
@@ -153,16 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'input1',
-                'Input 1'
-            ))
-                : vm.model.input2.title || ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'input2',
-                'Input 2'
-            ));
+                ? vm.model.input1.title || ( localizeWithPath(_moduleId, 0, 'Input 1'))
+                : vm.model.input2.title || ( localizeWithPath(_moduleId, 1, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -176,11 +174,11 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
         this._register(applyObservableDecorations(this.editor, this.decorations));
     }
 };
-InputCodeEditorView = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IContextMenuService)),
-    ( __param(4, IConfigurationService))
-], InputCodeEditorView));
+InputCodeEditorView = ( (__decorate([
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IContextMenuService))),
+    ( (__param(4, IConfigurationService)))
+], InputCodeEditorView)));
 class ModifiedBaseRangeGutterItemModel {
     constructor(id, baseRange, inputNumber, viewModel) {
         this.id = id;
@@ -235,54 +233,32 @@ class ModifiedBaseRangeGutterItemModel {
             });
         };
         function action(id, label, targetState, checked) {
-            const action = ( new Action(id, label, undefined, true, () => {
+            const action = ( (new Action(id, label, undefined, true, () => {
                 update(targetState);
-            }));
+            })));
             action.checked = checked;
             return action;
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.accept',
-                'Accept {0}',
-                this.model.input1.title
-            )), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localizeWithPath(_moduleId, 2, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.accept',
-                'Accept {0}',
-                this.model.input2.title
-            )), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localizeWithPath(_moduleId, 2, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.acceptBoth',
-                'Accept Both'
-            )), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localizeWithPath(_moduleId, 3, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
-            ( new Separator()),
+            ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.swap',
-                'Swap'
-            )), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localizeWithPath(_moduleId, 4, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.markAsHandled',
-                'Mark as Handled'
-            )), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localizeWithPath(_moduleId, 5, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
-            })), { checked: handled }),
+            }))), { checked: handled }),
         ].filter(isDefined);
     }
 }
@@ -291,12 +267,12 @@ class MergeConflictGutterItemView extends Disposable {
         super();
         this.isMultiLine = observableValue(this, false);
         this.item = observableValue(this, item);
-        const checkBox = ( new Toggle({
+        const checkBox = ( (new Toggle({
             isChecked: false,
             title: '',
             icon: Codicon.check,
             ...defaultToggleStyles
-        }));
+        })));
         checkBox.domNode.classList.add('accept-conflict-group');
         this._register(addDisposableListener(checkBox.domNode, EventType.MOUSE_DOWN, (e) => {
             const item = this.item.get();
@@ -321,26 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.excluded',
-                    "Accept"
-                )) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.conflicting',
-                    "Accept (result is dirty)"
-                )) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.first',
-                    "Undo accept"
-                )) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.second',
-                    "Undo accept (currently second)"
-                )) },
+                [0 ]: { icon: undefined, checked: false, title: ( localizeWithPath(_moduleId, 6, "Accept")) },
+                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(_moduleId, 7, "Accept (result is dirty)")) },
+                [1 ]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(_moduleId, 8, "Undo accept")) },
+                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(_moduleId, 9, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js

@@ -23,6 +23,7 @@ import { EditorGutter } from '../editorGutter.js';
 import { ctxIsMergeResultEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView";
 let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
     constructor(viewModel, instantiationService, _labelService, configurationService) {
         super(instantiationService, viewModel, configurationService);
@@ -34,7 +35,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const model = viewModel.model;
             const textModel = model.resultTextModel;
-            const result = ( new Array());
+            const result = ( (new Array()));
             const baseRangeWithStoreAndTouchingDiffs = join(model.modifiedBaseRanges.read(reader), model.baseResultDiffs.read(reader), (baseRange, diff) => baseRange.baseRange.touches(diff.inputRange)
                 ? CompareResult.neitherLessOrGreaterThan
                 : LineRange.compareByStart(baseRange.baseRange, diff.inputRange));
@@ -119,10 +120,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this.htmlElements.root.classList.add(`result`);
         this._register(autorunWithStore((reader, store) => {
             if (this.checkboxesVisible.read(reader)) {
-                store.add(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
+                store.add(( (new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
                     getIntersectingGutterItems: (range, reader) => [],
-                    createView: (item, target) => { throw new BugIndicatingError(); },
-                })));
+                    createView: (item, target) => { throw ( (new BugIndicatingError())); },
+                }))));
             }
         }));
         this._register(autorun(reader => {
@@ -131,14 +132,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'result',
-                'Result'
-            ))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localizeWithPath(_moduleId, 0, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
-        const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
+        const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
         this._register(autorun(reader => {
             const vm = this.viewModel.read(reader);
             if (!vm) {
@@ -150,18 +147,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'mergeEditor.remainingConflicts',
-                '{0} Conflict Remaining',
-                count
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                'mergeEditor.remainingConflict',
-                '{0} Conflicts Remaining ',
-                count
-            ));
+                ? ( localizeWithPath(_moduleId, 1, '{0} Conflict Remaining', count))
+                : ( localizeWithPath(_moduleId, 2, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -173,16 +160,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                    'goToNextConflict',
-                    'Go to next conflict'
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView',
-                    'allConflictHandled',
-                    'All conflicts handled, the merge can be completed now.'
-                )),
+                    ? ( localizeWithPath(_moduleId, 3, 'Go to next conflict'))
+                    : ( localizeWithPath(_moduleId, 4, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));
@@ -190,10 +169,10 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
         this._register(instantiationService.createInstance(TitleMenu, MenuId.MergeInputResultToolbar, this.htmlElements.toolbar));
     }
 };
-ResultCodeEditorView = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ILabelService)),
-    ( __param(3, IConfigurationService))
-], ResultCodeEditorView));
+ResultCodeEditorView = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, ILabelService))),
+    ( (__param(3, IConfigurationService)))
+], ResultCodeEditorView)));
 
 export { ResultCodeEditorView };

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

@@ -10,6 +10,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { isEqual, basename } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import './media/mergeEditor.css.js';
@@ -45,6 +46,7 @@ import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
 import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/mergeEditor";
 let MergeEditor = class MergeEditor extends AbstractTextEditor {
     static { MergeEditor_1 = this; }
     static { this.ID = 'mergeEditor'; }
@@ -66,9 +68,9 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._configurationService = _configurationService;
         this._codeEditorService = _codeEditorService;
         this.configurationService = configurationService;
-        this._sessionDisposables = ( new DisposableStore());
+        this._sessionDisposables = ( (new DisposableStore()));
         this._viewModel = observableValue(this, undefined);
-        this._grid = this._register(( new MutableDisposable()));
+        this._grid = this._register(( (new MutableDisposable())));
         this.input1View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 1, this._viewModel));
         this.baseView = observableValue(this, undefined);
         this.baseViewOptions = observableValue(this, undefined);
@@ -84,23 +86,23 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._ctxBaseUri = ctxMergeBaseUri.bindTo(this.contextKeyService);
         this._ctxShowNonConflictingChanges = ctxMergeEditorShowNonConflictingChanges.bindTo(this.contextKeyService);
         this._inputModel = observableValue(this, undefined);
-        this.viewZoneComputer = ( new ViewZoneComputer(
+        this.viewZoneComputer = ( (new ViewZoneComputer(
             this.input1View.editor,
             this.input2View.editor,
             this.inputResultView.editor
-        ));
+        )));
         this.codeLensesVisible = observableConfigValue('mergeEditor.showCodeLenses', true, this.configurationService);
-        this.scrollSynchronizer = this._register(( new ScrollSynchronizer(
+        this.scrollSynchronizer = this._register(( (new ScrollSynchronizer(
             this._viewModel,
             this.input1View,
             this.input2View,
             this.baseView,
             this.inputResultView,
             this._layoutModeObs
-        )));
-        this._onDidChangeSizeConstraints = ( new Emitter());
+        ))));
+        this._onDidChangeSizeConstraints = ( (new Emitter()));
         this.onDidChangeSizeConstraints = this._onDidChangeSizeConstraints.event;
-        this.baseViewDisposables = this._register(( new DisposableStore()));
+        this.baseViewDisposables = this._register(( (new DisposableStore())));
         this.showNonConflictingChangesStore = this.instantiationService.createInstance((PersistentStore), 'mergeEditor/showNonConflictingChanges');
         this.showNonConflictingChanges = observableValue(this, this.showNonConflictingChangesStore.get() ?? false);
     }
@@ -120,11 +122,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(
-            'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor',
-            'mergeEditor',
-            "Text Merge Editor"
-        ));
+        return ( localizeWithPath(_moduleId, 0, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;
@@ -155,7 +153,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     }
     async setInput(input, options, context, token) {
         if (!(input instanceof MergeEditorInput)) {
-            throw new BugIndicatingError('ONLY MergeEditorInput is supported');
+            throw ( (new BugIndicatingError('ONLY MergeEditorInput is supported')));
         }
         await super.setInput(input, options, context, token);
         this._sessionDisposables.clear();
@@ -178,8 +176,8 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             this._inputModel.set(inputModel, tx);
         });
         this._sessionDisposables.add(viewModel);
-        this._ctxResultUri.set(( inputModel.resultUri.toString()));
-        this._ctxBaseUri.set(( model.base.uri.toString()));
+        this._ctxResultUri.set(( (inputModel.resultUri.toString())));
+        this._ctxBaseUri.set(( (model.base.uri.toString())));
         this._sessionDisposables.add(toDisposable(() => {
             this._ctxBaseUri.reset();
             this._ctxResultUri.reset();
@@ -238,7 +236,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         const that = this;
         this._sessionDisposables.add(new (class {
             constructor() {
-                this._disposable = ( new DisposableStore());
+                this._disposable = ( (new DisposableStore()));
                 for (const model of this.baseInput1Input2()) {
                     this._disposable.add(model.onDidChangeContent(() => this._checkBaseInput1Input2AllEmpty()));
                 }
@@ -272,7 +270,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             shouldAlignBase,
             shouldAlignResult,
         });
-        const disposableStore = ( new DisposableStore());
+        const disposableStore = ( (new DisposableStore()));
         if (baseViewZoneAccessor) {
             for (const v of viewZones.baseViewZones) {
                 v.create(baseViewZoneAccessor, baseViewZoneIds, disposableStore);
@@ -511,20 +509,20 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         this._ctxShowNonConflictingChanges.set(this.showNonConflictingChanges.get());
     }
 };
-MergeEditor = MergeEditor_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, ITelemetryService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IThemeService)),
-    ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IEditorService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, IFileService)),
-    ( __param(11, ICodeEditorService)),
-    ( __param(12, IConfigurationService))
-], MergeEditor));
+MergeEditor = MergeEditor_1 = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, ITelemetryService))),
+    ( (__param(4, IStorageService))),
+    ( (__param(5, IThemeService))),
+    ( (__param(6, ITextResourceConfigurationService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IEditorService))),
+    ( (__param(9, IEditorGroupsService))),
+    ( (__param(10, IFileService))),
+    ( (__param(11, ICodeEditorService))),
+    ( (__param(12, IConfigurationService)))
+], MergeEditor)));
 let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     static { MergeEditorLayoutStore_1 = this; }
     static { this._key = 'mergeEditor/layout'; }
@@ -554,9 +552,9 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
         }
     }
 };
-MergeEditorLayoutStore = MergeEditorLayoutStore_1 = ( __decorate([
-    ( __param(0, IStorageService))
-], MergeEditorLayoutStore));
+MergeEditorLayoutStore = MergeEditorLayoutStore_1 = ( (__decorate([
+    ( (__param(0, IStorageService)))
+], MergeEditorLayoutStore)));
 let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContribution extends Disposable {
     constructor(_editorService, codeEditorService) {
         super();
@@ -578,10 +576,10 @@ let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContributio
         return null;
     }
 };
-MergeEditorOpenHandlerContribution = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, ICodeEditorService))
-], MergeEditorOpenHandlerContribution));
+MergeEditorOpenHandlerContribution = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, ICodeEditorService)))
+], MergeEditorOpenHandlerContribution)));
 let MergeEditorResolverContribution = class MergeEditorResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.mergeEditorResolver'; }
     constructor(editorResolverService, instantiationService) {
@@ -611,9 +609,9 @@ let MergeEditorResolverContribution = class MergeEditorResolverContribution exte
         }));
     }
 };
-MergeEditorResolverContribution = ( __decorate([
-    ( __param(0, IEditorResolverService)),
-    ( __param(1, IInstantiationService))
-], MergeEditorResolverContribution));
+MergeEditorResolverContribution = ( (__decorate([
+    ( (__param(0, IEditorResolverService))),
+    ( (__param(1, IInstantiationService)))
+], MergeEditorResolverContribution)));
 
 export { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/scrollSynchronizer.js

@@ -1,10 +1,11 @@
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { DocumentLineRangeMap } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { ReentrancyBarrier } from 'vscode/vscode/vs/base/common/controlFlow';
 
 class ScrollSynchronizer extends Disposable {
     get model() { return this.viewModel.get()?.model; }
@@ -42,7 +43,7 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
         };
-        this._store.add(this.input1View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.input1View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 handleInput1OnScroll();
             }
@@ -52,7 +53,7 @@ class ScrollSynchronizer extends Disposable {
                 this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
-        this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (!this.model) {
                 return;
             }
@@ -82,7 +83,7 @@ class ScrollSynchronizer extends Disposable {
                 this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
-        this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+        this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 if (this.shouldAlignResult) {
                     this.input1View.editor.setScrollTop(c.scrollTop, 1 );
@@ -109,7 +110,7 @@ class ScrollSynchronizer extends Disposable {
         this._store.add(autorunWithStore((reader, store) => {
             const baseView = this.baseView.read(reader);
             if (baseView) {
-                store.add(baseView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusive((c) => {
+                store.add(baseView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
                     if (c.scrollTopChanged) {
                         if (!this.model) {
                             return;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -6,6 +6,7 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -13,6 +14,7 @@ import { INotificationService } from 'vscode/vscode/vs/platform/notification/com
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/view/viewModel";
 let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     constructor(model, inputCodeEditorView1, inputCodeEditorView2, resultCodeEditorView, baseCodeEditorView, showNonConflictingChanges, configurationService, notificationService) {
         super();
@@ -25,7 +27,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         this.configurationService = configurationService;
         this.notificationService = notificationService;
         this.manuallySetActiveModifiedBaseRange = observableValue(this, { range: undefined, counter: 0 });
-        this.attachedHistory = this._register(( new AttachedHistory(this.model.resultTextModel)));
+        this.attachedHistory = this._register(( (new AttachedHistory(this.model.resultTextModel))));
         this.shouldUseAppendInsteadOfAccept = observableConfigValue('mergeEditor.shouldUseAppendInsteadOfAccept', false, this.configurationService);
         this.counter = 0;
         this.lastFocusedEditor = derivedObservableWithWritableCache(this, (reader, lastValue) => {
@@ -54,7 +56,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 return undefined;
             }
             const selections = sourceEditor.selection.read(reader) || [];
-            const rangesInBase = ( selections.map((selection) => {
+            const rangesInBase = ( (selections.map((selection) => {
                 if (sourceEditor === this.inputCodeEditorView1) {
                     return this.model.translateInputRangeToBase(1, selection);
                 }
@@ -70,7 +72,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 else {
                     return selection;
                 }
-            }));
+            })));
             return {
                 rangesInBase,
                 sourceEditor
@@ -104,10 +106,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
             const baseRangeStates = [];
             for (const change of e.changes) {
                 const rangeInBase = this.model.translateResultRangeToBase(Range.lift(change.range));
-                const baseRanges = this.model.findModifiedBaseRangesInRange(( new LineRange(
+                const baseRanges = this.model.findModifiedBaseRangesInRange(( (new LineRange(
                     rangeInBase.startLineNumber,
                     rangeInBase.endLineNumber - rangeInBase.startLineNumber
-                )));
+                ))));
                 if (baseRanges.length === 1) {
                     const isHandled = this.model.isHandled(baseRanges[0]).get();
                     if (!isHandled) {
@@ -204,8 +206,8 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
             this.notificationService.error(( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/viewModel',
-                'noConflictMessage',
+                _moduleId,
+                0,
                 "There is currently no conflict focused that can be toggled."
             )));
             return;
@@ -222,10 +224,10 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
         });
     }
 };
-MergeEditorViewModel = ( __decorate([
-    ( __param(6, IConfigurationService)),
-    ( __param(7, INotificationService))
-], MergeEditorViewModel));
+MergeEditorViewModel = ( (__decorate([
+    ( (__param(6, IConfigurationService))),
+    ( (__param(7, INotificationService)))
+], MergeEditorViewModel)));
 class AttachedHistory extends Disposable {
     constructor(model) {
         super();