@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

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

@@ -3,11 +3,13 @@ import { reset, h } from 'vscode/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { BugIndicatingError } from 'vscode/vscode/vs/base/common/errors';
 import 'vscode/vscode/vs/base/common/arrays';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/lifecycle';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localize } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -87,7 +89,7 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: MinimapPosition.Gutter,
+                            position: 2 ,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -115,16 +117,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11254, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11365, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11255,
+                    11366,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11256, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(11367, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));

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

@@ -3,10 +3,10 @@ import { h } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
+import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';

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

@@ -7,21 +7,21 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { transaction, observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import { derivedOpts, derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/event';
 import { autorunOpts, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derivedOpts, derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
-import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localize } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { InputState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
 import { applyObservableDecorations, setFields } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
@@ -96,7 +96,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: MinimapPosition.Gutter,
+                            position: 2 ,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -159,8 +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 || ( localize(11276, 'Input 1'))
-                : vm.model.input2.title || ( localize(11277, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11382, 'Input 1'))
+                : vm.model.input2.title || ( localize(11383, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -193,8 +193,8 @@ class ModifiedBaseRangeGutterItemModel {
                 .getState(this.baseRange)
                 .read(reader)
                 .getInput(this.inputNumber);
-            return input === InputState.second && !this.baseRange.isOrderRelevant
-                ? InputState.first
+            return input === 2  && !this.baseRange.isOrderRelevant
+                ? 1
                 : input;
         });
         this.state = derived(this, reader => {
@@ -242,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(11278, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11384, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11278, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11384, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11279, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11385, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(11280, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11386, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11281, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11387, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -297,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11282, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11283, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11284, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11285, "Undo accept (currently second)")) },
+                [0 ]: { icon: undefined, checked: false, title: ( localize(11388, "Accept")) },
+                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11389, "Accept (result is dirty)")) },
+                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11390, "Undo accept")) },
+                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11391, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -5,11 +5,12 @@ import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel
 import { CompareResult } from 'vscode/vscode/vs/base/common/arrays';
 import { BugIndicatingError } from 'vscode/vscode/vs/base/common/errors';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localize } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -70,7 +71,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                             blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                             description: 'Result Diff',
                             minimap: {
-                                position: MinimapPosition.Gutter,
+                                position: 2 ,
                                 color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                             },
                             overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -131,7 +132,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11271, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11392, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
@@ -146,8 +147,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(11272, '{0} Conflict Remaining', count))
-                : ( localize(11273, '{0} Conflicts Remaining ', count));
+                ? ( localize(11393, '{0} Conflict Remaining', count))
+                : ( localize(11394, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -159,8 +160,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(11274, 'Go to next conflict'))
-                    : ( localize(11275, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(11395, 'Go to next conflict'))
+                    : ( localize(11396, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -1,29 +1,26 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { reset } from 'vscode/vscode/vs/base/browser/dom';
 import { SerializableGrid } from '../../../../../base/browser/ui/grid/grid.js';
-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';
 import { DisposableStore, MutableDisposable, toDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue, transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/arrays';
 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/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
 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';
@@ -47,7 +44,6 @@ 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 { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
@@ -126,7 +122,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9803, "Text Merge Editor"));
+        return ( localize(9885, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;
@@ -318,7 +314,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, this.inputResultView.editor, ScrollType.Smooth);
+            applyTextEditorOptions(options, this.inputResultView.editor, 0 );
         }
     }
     clearInput() {
@@ -464,7 +460,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             height = this._grid.value.height;
         }
         this._grid.value = SerializableGrid.from({
-            orientation: Orientation.VERTICAL,
+            orientation: 0 ,
             size: 100,
             groups: descriptor,
         }, {
@@ -533,7 +529,7 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     constructor(_storageService) {
         this._storageService = _storageService;
         this._value = { kind: 'mixed', showBase: false, showBaseAtTop: true };
-        const value = _storageService.get(MergeEditorLayoutStore_1._key, StorageScope.PROFILE, 'mixed');
+        const value = _storageService.get(MergeEditorLayoutStore_1._key, 0 , 'mixed');
         if (value === 'mixed' || value === 'columns') {
             this._value = { kind: value, showBase: false, showBaseAtTop: true };
         }
@@ -552,7 +548,7 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     set value(value) {
         if (this._value !== value) {
             this._value = value;
-            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), 0 , 0 );
         }
     }
 };
@@ -574,7 +570,7 @@ let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContributio
             && activePane.input instanceof MergeEditorInput
             && isEqual(input.resource, activePane.input.result)) {
             const targetEditor = activePane.getControl();
-            applyTextEditorOptions(input.options, targetEditor, ScrollType.Smooth);
+            applyTextEditorOptions(input.options, targetEditor, 0 );
             return targetEditor;
         }
         return null;

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

@@ -1,10 +1,10 @@
 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 'vscode/vscode/vs/base/common/event';
 import { autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
+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';
 
@@ -25,9 +25,9 @@ class ScrollSynchronizer extends Disposable {
             if (!this.model) {
                 return;
             }
-            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
+            this.input2View.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
             if (this.shouldAlignResult) {
-                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
+                this.inputResultView.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
             }
             else {
                 const mappingInput1Result = this.model.input1ResultMapping.get();
@@ -36,7 +36,7 @@ class ScrollSynchronizer extends Disposable {
             const baseView = this.baseView.get();
             if (baseView) {
                 if (this.shouldAlignBase) {
-                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), ScrollType.Immediate);
+                    this.baseView.get()?.editor.setScrollTop(this.input1View.editor.getScrollTop(), 1 );
                 }
                 else {
                     const mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1)).reverse();
@@ -49,9 +49,9 @@ class ScrollSynchronizer extends Disposable {
                 handleInput1OnScroll();
             }
             if (c.scrollLeftChanged) {
-                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.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
         this._store.add(this.input2View.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
@@ -59,9 +59,9 @@ class ScrollSynchronizer extends Disposable {
                 return;
             }
             if (c.scrollTopChanged) {
-                this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                this.input1View.editor.setScrollTop(c.scrollTop, 1 );
                 if (this.shouldAlignResult) {
-                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), ScrollType.Immediate);
+                    this.inputResultView.editor.setScrollTop(this.input2View.editor.getScrollTop(), 1 );
                 }
                 else {
                     const mappingInput2Result = this.model.input2ResultMapping.get();
@@ -70,7 +70,7 @@ class ScrollSynchronizer extends Disposable {
                 const baseView = this.baseView.get();
                 if (baseView && this.model) {
                     if (this.shouldAlignBase) {
-                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                        this.baseView.get()?.editor.setScrollTop(c.scrollTop, 1 );
                     }
                     else {
                         const mapping = ( new DocumentLineRangeMap(this.model.baseInput2Diffs.get(), -1)).reverse();
@@ -79,16 +79,16 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                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.baseView.get()?.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
         this._store.add(this.inputResultView.editor.onDidScrollChange(this.reentrancyBarrier.makeExclusiveOrSkip((c) => {
             if (c.scrollTopChanged) {
                 if (this.shouldAlignResult) {
-                    this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
-                    this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                    this.input1View.editor.setScrollTop(c.scrollTop, 1 );
+                    this.input2View.editor.setScrollTop(c.scrollTop, 1 );
                 }
                 else {
                     const mapping1 = this.model?.resultInput1Mapping.get();
@@ -103,9 +103,9 @@ class ScrollSynchronizer extends Disposable {
                 }
             }
             if (c.scrollLeftChanged) {
-                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.baseView.get()?.editor?.setScrollLeft(c.scrollLeft, 1 );
+                this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
+                this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
             }
         })));
         this._store.add(autorunWithStore((reader, store) => {
@@ -117,8 +117,8 @@ class ScrollSynchronizer extends Disposable {
                             return;
                         }
                         if (this.shouldAlignBase) {
-                            this.input1View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
-                            this.input2View.editor.setScrollTop(c.scrollTop, ScrollType.Immediate);
+                            this.input1View.editor.setScrollTop(c.scrollTop, 1 );
+                            this.input2View.editor.setScrollTop(c.scrollTop, 1 );
                         }
                         else {
                             const baseInput1Mapping = ( new DocumentLineRangeMap(this.model.baseInput1Diffs.get(), -1));
@@ -130,9 +130,9 @@ class ScrollSynchronizer extends Disposable {
                         this.synchronizeScrolling(baseView.editor, this.inputResultView.editor, baseMapping);
                     }
                     if (c.scrollLeftChanged) {
-                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
-                        this.input1View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
-                        this.input2View.editor.setScrollLeft(c.scrollLeft, ScrollType.Immediate);
+                        this.inputResultView.editor.setScrollLeft(c.scrollLeft, 1 );
+                        this.input1View.editor.setScrollLeft(c.scrollLeft, 1 );
+                        this.input2View.editor.setScrollLeft(c.scrollLeft, 1 );
                     }
                 })));
             }
@@ -156,7 +156,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, ScrollType.Immediate);
+        targetEditor.setScrollTop(resultScrollPosition, 1 );
     }
 }
 

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

@@ -2,13 +2,13 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { findLast } from 'vscode/vscode/vs/base/common/arraysFind';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue, transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/arrays';
+import { derivedObservableWithWritableCache } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -186,7 +186,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
                 lineNumber: startLineNumber,
                 column: editor.editor.getModel().getLineFirstNonWhitespaceColumn(startLineNumber),
             });
-            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, ScrollType.Smooth);
+            editor.editor.revealLinesNearTop(startLineNumber, endLineNumberExclusive, 0 );
         }
     }
     goToNextModifiedBaseRange(predicate) {
@@ -206,7 +206,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(11257, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(11368, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

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

@@ -1,5 +1,5 @@
 import { $ } from 'vscode/vscode/vs/base/browser/dom';
-import { CompareResult, lastOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { CompareResult } from 'vscode/vscode/vs/base/common/arrays';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { join } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { ConflictActionsFactory, ActionsSource } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
@@ -53,7 +53,7 @@ class ViewZoneComputer {
                 const afterLineNumber = m.left.baseRange.startLineNumber + (lastBaseResultDiff?.resultingDeltaFromOriginalToModified ?? 0) - 1;
                 resultViewZones.push(( new CommandViewZone(this.conflictActionsFactoryResult, afterLineNumber, actions.resultItems)));
             }
-            const lastResultDiff = lastOrDefault(m.rights);
+            const lastResultDiff = m.rights.at(-1);
             if (lastResultDiff) {
                 lastBaseResultDiff = lastResultDiff;
             }

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -1,11 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { KEYBOARD_LAYOUT_OPEN_PICKER } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { isMacintosh, isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
@@ -23,23 +22,23 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( (new MutableDisposable())));
-        const name = ( localize(4345, "Keyboard Layout"));
+        const name = ( localize(4454, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(4346, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
                 ariaLabel: text,
                 command: KEYBOARD_LAYOUT_OPEN_PICKER
-            }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
+            }, 'status.workbench.keyboardLayout', 1 );
         }
         this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(4346, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -48,13 +47,13 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(4346, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
                     ariaLabel: text,
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
-                }, 'status.workbench.keyboardLayout', StatusbarAlignment.RIGHT);
+                }, 'status.workbench.keyboardLayout', 1 );
             }
         }));
     }
@@ -63,14 +62,14 @@ KeyboardLayoutPickerContribution = ( (__decorate([
     ( (__param(0, IKeyboardLayoutService))),
     ( (__param(1, IStatusbarService)))
 ], KeyboardLayoutPickerContribution)));
-registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        4347,
+        4456,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        4348,
+        4457,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -81,7 +80,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(4349, "Change Keyboard Layout")),
+            title: ( localize2(4458, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -111,17 +110,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(4350, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(4459, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(4351, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(4460, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(4352, "Auto Detect")),
+            label: ( localize(4461, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4353, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4462, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +143,7 @@ registerAction2(class extends Action2 {
                 });
             }, (error) => {
                 throw ( (new Error(
-                    localize(4354, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
+                    localize(4463, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
                 )));
             });
             return Promise.resolve();