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

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

@@ -1,3 +1,4 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -6,10 +7,11 @@ import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/action
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { MergeEditorInputData } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { MergeEditorInputData } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor } from '../view/mergeEditor.js';
-import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 class MergeEditorAction extends Action2 {
@@ -54,7 +56,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9931, 'Open Merge Editor')),
+            title: ( localize2(7142, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -70,10 +72,10 @@ class OpenMergeEditor extends Action2 {
     }
 }
 var IRelaxedOpenArgs;
-( ((function(IRelaxedOpenArgs) {
+(function (IRelaxedOpenArgs) {
     function validate(obj) {
         if (!obj || typeof obj !== 'object') {
-            throw ( (new TypeError('invalid argument')));
+            throw ( new TypeError('invalid argument'));
         }
         const o = obj;
         const base = toUri(o.base);
@@ -85,37 +87,29 @@ var IRelaxedOpenArgs;
     IRelaxedOpenArgs.validate = validate;
     function toInputData(obj) {
         if (typeof obj === 'string') {
-            return (
-                 (new MergeEditorInputData( (URI.parse(obj, true)), undefined, undefined, undefined))
-            );
+            return ( new MergeEditorInputData(( URI.parse(obj, true)), undefined, undefined, undefined));
         }
         if (!obj || typeof obj !== 'object') {
-            throw ( (new TypeError('invalid argument')));
+            throw ( new TypeError('invalid argument'));
         }
         if (isUriComponents(obj)) {
-            return (
-                 (new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined))
-            );
+            return ( new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined));
         }
         const o = obj;
         const title = o.title;
         const uri = toUri(o.uri);
         const detail = o.detail;
         const description = o.description;
-        return (
-             (new MergeEditorInputData(uri, title, detail, description))
-        );
+        return ( new MergeEditorInputData(uri, title, detail, description));
     }
     function toUri(obj) {
         if (typeof obj === 'string') {
-            return (
-                 (URI.parse(obj, true))
-            );
+            return ( URI.parse(obj, true));
         }
         else if (obj && typeof obj === 'object') {
             return URI.revive(obj);
         }
-        throw ( (new TypeError('invalid argument')));
+        throw ( new TypeError('invalid argument'));
     }
     function isUriComponents(obj) {
         if (!obj || typeof obj !== 'object') {
@@ -128,13 +122,13 @@ var IRelaxedOpenArgs;
             && typeof o.query === 'string'
             && typeof o.fragment === 'string';
     }
-})(IRelaxedOpenArgs || (IRelaxedOpenArgs = {}))));
+})(IRelaxedOpenArgs || (IRelaxedOpenArgs = {}));
 class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9932, "Mixed Layout")),
-            toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
+            title: ( localize2(7143, "Mixed Layout")),
+            toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
                     id: MenuId.EditorTitle,
@@ -157,8 +151,8 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9933, 'Column Layout')),
-            toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
+            title: ( localize2(7144, 'Column Layout')),
+            toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
             menu: [{
                     id: MenuId.EditorTitle,
                     when: ctxIsMergeEditor,
@@ -179,8 +173,8 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9934, "Show Non-Conflicting Changes")),
-            toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
+            title: ( localize2(7145, "Show Non-Conflicting Changes")),
+            toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
                     id: MenuId.EditorTitle,
@@ -203,15 +197,12 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9935, "Show Base")),
-            toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
+            title: ( localize2(7146, "Show Base")),
+            toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(
-                        ctxIsMergeEditor,
-                         (ctxMergeEditorLayout.isEqualTo('columns'))
-                    ))),
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('columns')))),
                     group: '2_merge',
                     order: 9,
                 },
@@ -229,12 +220,12 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9936, "Show Base Top")),
-            toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
+            title: ( localize2(7147, "Show Base Top")),
+            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(ctxIsMergeEditor,  (ctxMergeEditorLayout.isEqualTo('mixed'))))),
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
                     group: '2_merge',
                     order: 10,
                 },
@@ -252,15 +243,12 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9937, "Show Base Center")),
-            toggled: ( (ContextKeyExpr.and(
-                ctxMergeEditorShowBase,
-                 (ctxMergeEditorShowBaseAtTop.negate())
-            ))),
+            title: ( localize2(7148, "Show Base Center")),
+            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
                     id: MenuId.EditorTitle,
-                    when: ( (ContextKeyExpr.and(ctxIsMergeEditor,  (ctxMergeEditorLayout.isEqualTo('mixed'))))),
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
                     group: '2_merge',
                     order: 11,
                 },
@@ -274,13 +262,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9938, "Merge Editor"));
+const mergeEditorCategory = ( localize2(7149, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9939, "Open File")),
+            title: ( localize2(7150, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -301,7 +289,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9940, "Go to Next Unhandled Conflict")),
+            title: ( localize2(7151, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -325,7 +313,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9941, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(7152, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -349,7 +337,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9942, "Toggle Current Conflict from Left")),
+            title: ( localize2(7153, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -363,7 +351,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9943, "Toggle Current Conflict from Right")),
+            title: ( localize2(7154, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -377,8 +365,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9944, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9945, 'Compare With Base')),
+            title: ( localize2(7155, "Compare Input 1 With Base")),
+            shortTitle: ( localize(7156, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -395,8 +383,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9946, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9945, 'Compare With Base')),
+            title: ( localize2(7157, "Compare Input 2 With Base")),
+            shortTitle: ( localize(7156, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -432,7 +420,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9947, "Open Base File")),
+            title: ( localize2(7158, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -447,7 +435,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9948, "Accept All Changes from Left")),
+            title: ( localize2(7159, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -463,7 +451,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9949, "Accept All Changes from Right")),
+            title: ( localize2(7160, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -479,8 +467,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9950, "Reset Result")),
-            shortTitle: ( localize(9951, 'Reset')),
+            title: ( localize2(7161, "Reset Result")),
+            shortTitle: ( localize(7162, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -496,12 +484,12 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9952, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(7163, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove(StorageCloseWithConflicts, 0 );
+        accessor.get(IStorageService).remove(StorageCloseWithConflicts, StorageScope.PROFILE);
     }
 }
 class AcceptMerge extends MergeEditorAction2 {
@@ -509,7 +497,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9953, "Complete Merge")),
+            title: ( localize2(7164, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -520,12 +508,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9954,
+                    7165,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9955, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9956, "&&Complete with Conflicts"))
+                detail: ( localize(7166, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(7167, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

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

@@ -0,0 +1,18 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class MergeEditorCopyContentsToJSON extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor): void;
+}
+export declare class MergeEditorSaveContentsToFolder extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export declare class MergeEditorLoadContentsFromFolder extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, args?: {
+        folderUri?: URI;
+        resultState?: "initial" | "current";
+    }): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -1,3 +1,4 @@
+
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -10,16 +11,16 @@ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.servi
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { MergeEditor } from '../view/mergeEditor.js';
-import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { ctxIsMergeEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9957, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(7168, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9958, "Copy Merge Editor State as JSON")),
+            title: ( localize2(7169, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -31,8 +32,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9959, 'Merge Editor')),
-                message: ( localize(9960, "No active merge editor"))
+                name: ( localize(7170, 'Merge Editor')),
+                message: ( localize(7171, "No active merge editor"))
             });
             return;
         }
@@ -51,8 +52,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9959, 'Merge Editor')),
-            message: ( localize(9961, "Successfully copied merge editor state")),
+            name: ( localize(7170, 'Merge Editor')),
+            message: ( localize(7172, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9962, "Save Merge Editor State to Folder")),
+            title: ( localize2(7173, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -75,8 +76,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9959, 'Merge Editor')),
-                message: ( localize(9960, "No active merge editor"))
+                name: ( localize(7170, 'Merge Editor')),
+                message: ( localize(7171, "No active merge editor"))
             });
             return;
         }
@@ -88,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9963, 'Select folder to save to'))
+            title: ( localize(7174, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9959, 'Merge Editor')),
-            message: ( localize(9964, "Successfully saved merge editor state to folder")),
+            name: ( localize(7170, 'Merge Editor')),
+            message: ( localize(7175, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -116,7 +117,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9965, "Load Merge Editor State from Folder")),
+            title: ( localize2(7176, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -135,7 +136,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9963, 'Select folder to save to'))
+                title: ( localize(7174, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,30 +1,32 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { OpenResultResource, SetMixedLayout, SetColumnLayout, OpenMergeEditor, OpenBaseFile, ShowNonConflictingChanges, ShowHideBase, ShowHideTopBase, ShowHideCenterBase, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, ToggleActiveConflictInput1, ToggleActiveConflictInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, AcceptAllInput1, AcceptAllInput2, ResetToBaseAndAutoMergeCommand, AcceptMerge, ResetCloseWithConflictsChoice } from './commands/commands.js';
 import { MergeEditorCopyContentsToJSON, MergeEditorSaveContentsToFolder, MergeEditorLoadContentsFromFolder } from './commands/devCommands.js';
-import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4438, "Merge Editor"))), [
-    ( (new SyncDescriptor(MergeEditorInput)))
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7177, "Merge Editor"))), [
+    ( new SyncDescriptor(MergeEditorInput))
 ]);
-( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
+( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     properties: {
         'mergeEditor.diffAlgorithm': {
             type: 'string',
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(4439, "Uses the legacy diffing algorithm.")),
-                ( localize(4440, "Uses the advanced diffing algorithm.")),
+                ( localize(7178, "Uses the legacy diffing algorithm.")),
+                ( localize(7179, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {
@@ -57,7 +59,7 @@ registerAction2(ResetCloseWithConflictsChoice);
 registerAction2(MergeEditorCopyContentsToJSON);
 registerAction2(MergeEditorSaveContentsToFolder);
 registerAction2(MergeEditorLoadContentsFromFolder);
-( (Registry
-    .as(Extensions$1.Workbench)))
-    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
-registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );
+( Registry
+    .as(Extensions$1.Workbench))
+    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, WorkbenchPhase.BlockStartup );

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

@@ -0,0 +1,27 @@
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorSerializer } from "vscode/vscode/vs/workbench/common/editor";
+import { MergeEditorInput } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput";
+export declare class MergeEditorSerializer implements IEditorSerializer {
+    canSerialize(): boolean;
+    serialize(editor: MergeEditorInput): string;
+    toJSON(editor: MergeEditorInput): MergeEditorInputJSON;
+    deserialize(instantiationService: IInstantiationService, raw: string): MergeEditorInput | undefined;
+}
+interface MergeEditorInputJSON {
+    base: URI;
+    input1: {
+        uri: URI;
+        title?: string;
+        detail?: string;
+        description?: string;
+    };
+    input2: {
+        uri: URI;
+        title?: string;
+        detail?: string;
+        description?: string;
+    };
+    result: URI;
+}
+export {};

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

@@ -1,6 +1,7 @@
+
 import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { parse } from 'vscode/vscode/vs/base/common/marshalling';
-import { MergeEditorInput, MergeEditorInputData } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { MergeEditorInput, MergeEditorInputData } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 
 class MergeEditorSerializer {
     canSerialize() {

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

@@ -0,0 +1,13 @@
+export declare const diff: string;
+export declare const diffWord: string;
+export declare const diffBase: string;
+export declare const diffWordBase: string;
+export declare const conflictBorderUnhandledUnfocused: string;
+export declare const conflictBorderUnhandledFocused: string;
+export declare const conflictBorderHandledUnfocused: string;
+export declare const conflictBorderHandledFocused: string;
+export declare const handledConflictMinimapOverViewRulerColor: string;
+export declare const unhandledConflictMinimapOverViewRulerColor: string;
+export declare const conflictingLinesBackground: string;
+export declare const conflictInput1Background: string;
+export declare const conflictInput2Background: string;

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

@@ -1,3 +1,4 @@
+
 import { localize } from 'vscode/vscode/vs/nls';
 import { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -11,19 +12,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11487, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11488, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11489, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11490, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11491, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11492, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11493, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11494, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11495, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11496, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11497, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(7212, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(7213, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(7214, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(7215, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(7216, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(7217, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(7218, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(7219, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(7220, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(7221, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(7222, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11498, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11499, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(7223, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(7224, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -0,0 +1,31 @@
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IReader } from "vscode/vscode/vs/base/common/observable";
+import { CodeEditorWidget } from "vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
+import { LineRange } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange";
+export declare class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends Disposable {
+    private readonly _editor;
+    private readonly _domNode;
+    private readonly itemProvider;
+    private readonly scrollTop;
+    private readonly isScrollTopZero;
+    private readonly modelAttached;
+    private readonly editorOnDidChangeViewZones;
+    private readonly editorOnDidContentSizeChange;
+    private readonly domNodeSizeChanged;
+    constructor(_editor: CodeEditorWidget, _domNode: HTMLElement, itemProvider: IGutterItemProvider<T>);
+    dispose(): void;
+    private readonly views;
+    private render;
+}
+export interface IGutterItemProvider<TItem extends IGutterItemInfo> {
+    getIntersectingGutterItems(range: LineRange, reader: IReader): TItem[];
+    createView(item: TItem, target: HTMLElement): IGutterItemView<TItem>;
+}
+export interface IGutterItemInfo {
+    id: string;
+    range: LineRange;
+}
+export interface IGutterItemView<T extends IGutterItemInfo> extends IDisposable {
+    update(item: T): void;
+    layout(top: number, height: number, viewTop: number, viewHeight: number): void;
+}