@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.d.ts

@@ -0,0 +1,117 @@
+import { Dimension } from "vscode/vscode/vs/base/browser/dom";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { ICodeEditorService } from "vscode/vscode/vs/editor/browser/services/codeEditorService";
+import { IEditorOptions as ICodeEditorOptions } from "vscode/vscode/vs/editor/common/config/editorOptions";
+import { ICodeEditorViewState } from "vscode/vscode/vs/editor/common/editorCommon";
+import { ITextResourceConfigurationService } from "vscode/vscode/vs/editor/common/services/textResourceConfiguration";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IEditorOptions, ITextEditorOptions } from "vscode/vscode/vs/platform/editor/common/editor";
+import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { AbstractTextEditor } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/browser/parts/editor/textEditor";
+import { IEditorOpenContext } from "vscode/vscode/vs/workbench/common/editor";
+import { EditorInput } from "vscode/vscode/vs/workbench/common/editor/editorInput";
+import { IMergeEditorInputModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
+import { MergeEditorModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
+import { MergeEditorViewModel } from "./viewModel.js";
+import { MergeEditorLayoutKind } from "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor";
+import { IEditorGroup } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IEditorResolverService } from "vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
+    private readonly contextKeyService;
+    private readonly _configurationService;
+    private readonly _codeEditorService;
+    private readonly configurationService;
+    static readonly ID = "mergeEditor";
+    private readonly _sessionDisposables;
+    private readonly _viewModel;
+    get viewModel(): IObservable<MergeEditorViewModel | undefined>;
+    private rootHtmlElement;
+    private readonly _grid;
+    private readonly input1View;
+    private readonly baseView;
+    private readonly baseViewOptions;
+    private readonly input2View;
+    private readonly inputResultView;
+    private readonly _layoutMode;
+    private readonly _layoutModeObs;
+    private readonly _ctxIsMergeEditor;
+    private readonly _ctxUsesColumnLayout;
+    private readonly _ctxShowBase;
+    private readonly _ctxShowBaseAtTop;
+    private readonly _ctxResultUri;
+    private readonly _ctxBaseUri;
+    private readonly _ctxShowNonConflictingChanges;
+    private readonly _inputModel;
+    get inputModel(): IObservable<IMergeEditorInputModel | undefined>;
+    get model(): MergeEditorModel | undefined;
+    private get inputsWritable();
+    private readonly viewZoneComputer;
+    protected readonly codeLensesVisible: IObservable<boolean, unknown>;
+    private readonly scrollSynchronizer;
+    constructor(group: IEditorGroup, instantiation: IInstantiationService, contextKeyService: IContextKeyService, telemetryService: ITelemetryService, storageService: IStorageService, themeService: IThemeService, textResourceConfigurationService: ITextResourceConfigurationService, _configurationService: IConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService, fileService: IFileService, _codeEditorService: ICodeEditorService, configurationService: IConfigurationService);
+    dispose(): void;
+    private readonly _onDidChangeSizeConstraints;
+    readonly onDidChangeSizeConstraints: Event<void>;
+    get minimumWidth(): number;
+    getTitle(): string;
+    protected createEditorControl(parent: HTMLElement, initialOptions: ICodeEditorOptions): void;
+    protected updateEditorControlOptions(options: ICodeEditorOptions): void;
+    private applyOptions;
+    protected getMainControl(): ICodeEditor | undefined;
+    layout(dimension: Dimension): void;
+    setInput(input: EditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    private setViewZones;
+    setOptions(options: ITextEditorOptions | undefined): void;
+    clearInput(): void;
+    focus(): void;
+    hasFocus(): boolean;
+    protected setEditorVisible(visible: boolean): void;
+    getControl(): ICodeEditor | undefined;
+    get scopedContextKeyService(): IContextKeyService | undefined;
+    toggleBase(): void;
+    toggleShowBaseTop(): void;
+    toggleShowBaseCenter(): void;
+    setLayoutKind(kind: MergeEditorLayoutKind): void;
+    setLayout(newLayout: IMergeEditorLayout): void;
+    private readonly baseViewDisposables;
+    private applyLayout;
+    private setGrid;
+    private _applyViewState;
+    protected computeEditorViewState(resource: URI): IMergeEditorViewState | undefined;
+    protected tracksEditorViewState(input: EditorInput): boolean;
+    private readonly showNonConflictingChangesStore;
+    private readonly showNonConflictingChanges;
+    toggleShowNonConflictingChanges(): void;
+}
+export interface IMergeEditorLayout {
+    readonly kind: MergeEditorLayoutKind;
+    readonly showBase: boolean;
+    readonly showBaseAtTop: boolean;
+}
+export declare class MergeEditorOpenHandlerContribution extends Disposable {
+    private readonly _editorService;
+    constructor(_editorService: IEditorService, codeEditorService: ICodeEditorService);
+    private openCodeEditorFromMergeEditor;
+}
+export declare class MergeEditorResolverContribution extends Disposable {
+    static readonly ID = "workbench.contrib.mergeEditorResolver";
+    constructor(editorResolverService: IEditorResolverService, instantiationService: IInstantiationService);
+}
+type IMergeEditorViewState = ICodeEditorViewState & {
+    readonly input1State?: ICodeEditorViewState;
+    readonly input2State?: ICodeEditorViewState;
+    readonly focusIndex: number;
+};
+export {};

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

@@ -1,6 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { reset } from 'vscode/vscode/vs/base/browser/dom';
-import { SerializableGrid } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/base/browser/ui/grid/grid';
+import { SerializableGrid } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid';
+import 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { BugIndicatingError, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -15,28 +17,30 @@ import { isEqual, basename } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import './media/mergeEditor.css.js';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import '../../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
+import { AbstractTextEditor } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/browser/parts/editor/textEditor';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
-import { applyTextEditorOptions } from 'vscode/vscode/vs/workbench/common/editor/editorOptions';
+import { applyTextEditorOptions } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { PersistentStore, deepMerge, thenIfNotDisposed } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { PersistentStore, deepMerge, thenIfNotDisposed } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';
 import { MergeEditorViewModel } from './viewModel.js';
 import { ViewZoneComputer } from './viewZones.js';
-import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeResultUri, ctxMergeBaseUri, ctxMergeEditorShowNonConflictingChanges } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { settingsSashBorder } from 'vscode/vscode/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
+import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeResultUri, ctxMergeBaseUri, ctxMergeEditorShowNonConflictingChanges } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { settingsSashBorder } from '@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common/vscode/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -44,7 +48,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import './colors.js';
 import { InputCodeEditorView } from './editors/inputCodeEditorView.js';
 import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
-import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
 let MergeEditor = class MergeEditor extends AbstractTextEditor {
@@ -68,9 +72,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);
@@ -86,23 +90,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);
     }
@@ -122,7 +126,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9966, "Text Merge Editor"));
+        return localize(7261, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;
@@ -153,7 +157,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();
@@ -176,8 +180,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();
@@ -236,7 +240,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()));
                 }
@@ -270,7 +274,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);
@@ -314,7 +318,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, this.inputResultView.editor, 0 );
+            applyTextEditorOptions(options, this.inputResultView.editor, ScrollType.Smooth);
         }
     }
     clearInput() {
@@ -460,7 +464,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             height = this._grid.value.height;
         }
         this._grid.value = SerializableGrid.from({
-            orientation: 0 ,
+            orientation: Orientation.VERTICAL,
             size: 100,
             groups: descriptor,
         }, {
@@ -509,27 +513,27 @@ 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'; }
     constructor(_storageService) {
         this._storageService = _storageService;
         this._value = { kind: 'mixed', showBase: false, showBaseAtTop: true };
-        const value = _storageService.get(MergeEditorLayoutStore_1._key, 0 , 'mixed');
+        const value = _storageService.get(MergeEditorLayoutStore_1._key, StorageScope.PROFILE, 'mixed');
         if (value === 'mixed' || value === 'columns') {
             this._value = { kind: value, showBase: false, showBaseAtTop: true };
         }
@@ -548,13 +552,13 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     set value(value) {
         if (this._value !== value) {
             this._value = value;
-            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), 0 , 0 );
+            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), StorageScope.PROFILE, StorageTarget.USER);
         }
     }
 };
-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();
@@ -570,16 +574,16 @@ let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContributio
             && activePane.input instanceof MergeEditorInput
             && isEqual(input.resource, activePane.input.result)) {
             const targetEditor = activePane.getControl();
-            applyTextEditorOptions(input.options, targetEditor, 0 );
+            applyTextEditorOptions(input.options, targetEditor, ScrollType.Smooth);
             return targetEditor;
         }
         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) {
@@ -609,9 +613,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.d.ts

@@ -0,0 +1,22 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable } from "vscode/vscode/vs/base/common/observable";
+import { BaseCodeEditorView } from "./editors/baseCodeEditorView.js";
+import { IMergeEditorLayout } from "./mergeEditor.js";
+import { MergeEditorViewModel } from "./viewModel.js";
+import { InputCodeEditorView } from "./editors/inputCodeEditorView.js";
+import { ResultCodeEditorView } from "./editors/resultCodeEditorView.js";
+export declare class ScrollSynchronizer extends Disposable {
+    private readonly viewModel;
+    private readonly input1View;
+    private readonly input2View;
+    private readonly baseView;
+    private readonly inputResultView;
+    private readonly layout;
+    private get model();
+    private readonly reentrancyBarrier;
+    readonly updateScrolling: () => void;
+    private get shouldAlignResult();
+    private get shouldAlignBase();
+    constructor(viewModel: IObservable<MergeEditorViewModel | undefined>, input1View: InputCodeEditorView, input2View: InputCodeEditorView, baseView: IObservable<BaseCodeEditorView | undefined>, inputResultView: ResultCodeEditorView, layout: IObservable<IMergeEditorLayout>);
+    private synchronizeScrolling;
+}

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

@@ -1,3 +1,4 @@
+
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/event';
@@ -5,8 +6,9 @@ import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInterna
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { DocumentLineRangeMap } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from 'vscode/vscode/vs/base/common/controlFlow';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
+import { DocumentLineRangeMap } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { ReentrancyBarrier } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/base/common/controlFlow';
 
 class ScrollSynchronizer extends Disposable {
     get model() { return this.viewModel.get()?.model; }
@@ -25,9 +27,9 @@ class ScrollSynchronizer extends Disposable {
             if (!this.model) {
                 return;
             }
-            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
             if (this.shouldAlignResult) {
-                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
             }
             else {
                 const mappingInput1Result = this.model.input1ResultMapping.get();
@@ -36,7 +38,7 @@ class ScrollSynchronizer extends Disposable {
             const baseView = this.baseView.get();
             if (baseView) {
                 if (this.shouldAlignBase) {
-                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
+                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
                 }
                 else {
                     const mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1)).reverse();
@@ -49,9 +51,9 @@ class ScrollSynchronizer extends Disposable {
                 handleInput1OnScroll();
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
@@ -59,9 +61,9 @@ class ScrollSynchronizer extends Disposable {
                 return;
             }
             if (c.scrollTopChanged) {
-                this.input1View.editor.setScrollTop(c.scrollTop, 1 );
+                this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                 if (this.shouldAlignResult) {
-                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), 1 );
+                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), ScrollType.Immediate);
                 }
                 else {
                     const mappingInput2Result = this.model.input2ResultMapping.get();
@@ -70,7 +72,7 @@ class ScrollSynchronizer extends Disposable {
                 const baseView = this.baseView.get();
                 if (baseView && this.model) {
                     if (this.shouldAlignBase) {
-                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, 1 );
+                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                     }
                     else {
                         const mapping = ( new DocumentLineRangeMap(this.model.baseInput2Diffs.get(), -1)).reverse();
@@ -79,16 +81,16 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 if (this.shouldAlignResult) {
-                    this.input1View.editor.setScrollTop(c.scrollTop, 1 );
-                    this.input2View.editor.setScrollTop(c.scrollTop, 1 );
+                    this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                    this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                 }
                 else {
                     const mapping1 = this.model?.resultInput1Mapping.get();
@@ -103,9 +105,9 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                this.baseView.get()?.editor?.setScrollLeft(c.scrollLeft, 1 );
-                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.baseView.get()?.editor?.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
             }
         })));
         this._store.add(autorunWithStore((reader, store) => {
@@ -117,8 +119,8 @@ class ScrollSynchronizer extends Disposable {
                             return;
                         }
                         if (this.shouldAlignBase) {
-                            this.input1View.editor.setScrollTop(c.scrollTop, 1 );
-                            this.input2View.editor.setScrollTop(c.scrollTop, 1 );
+                            this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                            this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
                         }
                         else {
                             const baseInput1Mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1));
@@ -130,9 +132,9 @@ class ScrollSynchronizer extends Disposable {
                         this.synchronizeScrolling(baseView.editor, this.inputResultView.editor, baseMapping);
                     }
                     if (c.scrollLeftChanged) {
-                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
-                        this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
-                        this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
+                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                        this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                        this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
                     }
                 })));
             }
@@ -156,7 +158,7 @@ class ScrollSynchronizer extends Disposable {
         const sourceEndPx = scrollingEditor.getTopForLineNumber(sourceRange.endLineNumberExclusive);
         const factor = Math.min((scrollingEditor.getScrollTop() - sourceStartTopPx) / (sourceEndPx - sourceStartTopPx), 1);
         const resultScrollPosition = resultStartTopPx + (resultEndPx - resultStartTopPx) * factor;
-        targetEditor.setScrollTop(resultScrollPosition, 1 );
+        targetEditor.setScrollTop(resultScrollPosition, ScrollType.Immediate);
     }
 }
 

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

@@ -0,0 +1,41 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IObservable, ITransaction } from "vscode/vscode/vs/base/common/observable";
+import { Range } from "vscode/vscode/vs/editor/common/core/range";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { MergeEditorModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
+import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+import { BaseCodeEditorView } from "./editors/baseCodeEditorView.js";
+import { CodeEditorView } from "./editors/codeEditorView.js";
+import { InputCodeEditorView } from "./editors/inputCodeEditorView.js";
+import { ResultCodeEditorView } from "./editors/resultCodeEditorView.js";
+export declare class MergeEditorViewModel extends Disposable {
+    readonly model: MergeEditorModel;
+    readonly inputCodeEditorView1: InputCodeEditorView;
+    readonly inputCodeEditorView2: InputCodeEditorView;
+    readonly resultCodeEditorView: ResultCodeEditorView;
+    readonly baseCodeEditorView: IObservable<BaseCodeEditorView | undefined>;
+    readonly showNonConflictingChanges: IObservable<boolean>;
+    private readonly configurationService;
+    private readonly notificationService;
+    private readonly manuallySetActiveModifiedBaseRange;
+    private readonly attachedHistory;
+    constructor(model: MergeEditorModel, inputCodeEditorView1: InputCodeEditorView, inputCodeEditorView2: InputCodeEditorView, resultCodeEditorView: ResultCodeEditorView, baseCodeEditorView: IObservable<BaseCodeEditorView | undefined>, showNonConflictingChanges: IObservable<boolean>, configurationService: IConfigurationService, notificationService: INotificationService);
+    readonly shouldUseAppendInsteadOfAccept: IObservable<boolean, unknown>;
+    private counter;
+    private readonly lastFocusedEditor;
+    readonly baseShowDiffAgainst: IObservable<2 | 1 | undefined, unknown>;
+    readonly selectionInBase: IObservable<{
+        rangesInBase: Range[];
+        sourceEditor: CodeEditorView;
+    } | undefined, unknown>;
+    private getRangeOfModifiedBaseRange;
+    readonly activeModifiedBaseRange: IObservable<ModifiedBaseRange | undefined, unknown>;
+    setActiveModifiedBaseRange(range: ModifiedBaseRange | undefined, tx: ITransaction): void;
+    setState(baseRange: ModifiedBaseRange, state: ModifiedBaseRangeState, tx: ITransaction, inputNumber: InputNumber): void;
+    private goToConflict;
+    goToNextModifiedBaseRange(predicate: (m: ModifiedBaseRange) => boolean): void;
+    goToPreviousModifiedBaseRange(predicate: (m: ModifiedBaseRange) => boolean): void;
+    toggleActiveConflict(inputNumber: 1 | 2): void;
+    acceptAll(inputNumber: 1 | 2): void;
+}