@codingame/monaco-vscode-extensions-service-override 1.85.0 → 1.85.1

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

@@ -1,144 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { assertFn } from 'monaco-editor/esm/vs/base/common/assert.js';
-import { autorun } from 'monaco-editor/esm/vs/base/common/observable.js';
-import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
-import { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
-import { MergeEditorTelemetry } from './telemetry.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-
-var MergeEditorInput_1;
-let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditorInput {
-    static { MergeEditorInput_1 = this; }
-    static { this.ID = 'mergeEditor.Input'; }
-    get useWorkingCopy() {
-        return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
-    }
-    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService) {
-        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService);
-        this.base = base;
-        this.input1 = input1;
-        this.input2 = input2;
-        this.result = result;
-        this._instaService = _instaService;
-        this.configurationService = configurationService;
-        this.closeHandler = {
-            showConfirm: () => this._inputModel?.shouldConfirmClose() ?? false,
-            confirm: async (editors) => {
-                assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput_1));
-                const inputModels = ( editors.map(e => e.editor._inputModel)).filter(isDefined);
-                return await this._inputModel.confirmClose(inputModels);
-            },
-        };
-        this.mergeEditorModeFactory = this._instaService.createInstance(this.useWorkingCopy
-            ? TempFileMergeEditorModeFactory
-            : WorkspaceMergeEditorModeFactory, this._instaService.createInstance(MergeEditorTelemetry));
-    }
-    dispose() {
-        super.dispose();
-    }
-    get typeId() {
-        return MergeEditorInput_1.ID;
-    }
-    get editorId() {
-        return DEFAULT_EDITOR_ASSOCIATION.id;
-    }
-    get capabilities() {
-        let capabilities = super.capabilities | 256 ;
-        if (this.useWorkingCopy) {
-            capabilities |= 4 ;
-        }
-        return capabilities;
-    }
-    getName() {
-        return ( localizeWithPath(
-            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput',
-            'name',
-            "Merging: {0}",
-            super.getName()
-        ));
-    }
-    async resolve() {
-        if (!this._inputModel) {
-            const inputModel = this._register(await this.mergeEditorModeFactory.createInputModel({
-                base: this.base,
-                input1: this.input1,
-                input2: this.input2,
-                result: this.result,
-            }));
-            this._inputModel = inputModel;
-            this._register(autorun(reader => {
-                inputModel.isDirty.read(reader);
-                this._onDidChangeDirty.fire();
-            }));
-            await this._inputModel.model.onInitialized;
-        }
-        return this._inputModel;
-    }
-    async accept() {
-        await this._inputModel?.accept();
-    }
-    async save(group, options) {
-        await this._inputModel?.save(options);
-        return undefined;
-    }
-    toUntyped() {
-        return {
-            input1: { resource: this.input1.uri, label: this.input1.title, description: this.input1.description, detail: this.input1.detail },
-            input2: { resource: this.input2.uri, label: this.input2.title, description: this.input2.description, detail: this.input2.detail },
-            base: { resource: this.base },
-            result: { resource: this.result },
-            options: {
-                override: this.typeId
-            }
-        };
-    }
-    matches(otherInput) {
-        if (this === otherInput) {
-            return true;
-        }
-        if (otherInput instanceof MergeEditorInput_1) {
-            return isEqual(this.base, otherInput.base)
-                && isEqual(this.input1.uri, otherInput.input1.uri)
-                && isEqual(this.input2.uri, otherInput.input2.uri)
-                && isEqual(this.result, otherInput.result);
-        }
-        if (isResourceMergeEditorInput(otherInput)) {
-            return (this.editorId === otherInput.options?.override || otherInput.options?.override === undefined)
-                && isEqual(this.base, otherInput.base.resource)
-                && isEqual(this.input1.uri, otherInput.input1.resource)
-                && isEqual(this.input2.uri, otherInput.input2.resource)
-                && isEqual(this.result, otherInput.result.resource);
-        }
-        return false;
-    }
-    async revert(group, options) {
-        return this._inputModel?.revert(options);
-    }
-    isDirty() {
-        return this._inputModel?.isDirty.get() ?? false;
-    }
-    setLanguageId(languageId, source) {
-        this._inputModel?.model.setLanguageId(languageId, source);
-    }
-};
-MergeEditorInput = MergeEditorInput_1 = ( __decorate([
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, ITextFileService)),
-    ( __param(7, ILabelService)),
-    ( __param(8, IFileService)),
-    ( __param(9, IConfigurationService)),
-    ( __param(10, IFilesConfigurationService))
-], MergeEditorInput));
-
-export { MergeEditorInput };

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

@@ -1,482 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { assertFn } from 'monaco-editor/esm/vs/base/common/assert.js';
-import { BugIndicatingError } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { observableValue, observableFromEvent, derived } from 'monaco-editor/esm/vs/base/common/observable.js';
-import { basename, isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
-import { EditorModel } from 'vscode/vscode/vs/workbench/common/editor/editorModel';
-import { conflictMarkers } from './mergeMarkers/mergeMarkersController.js';
-import { MergeDiffComputer } from './model/diffComputer.js';
-import { MergeEditorModel } from './model/mergeEditorModel.js';
-import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
-
-var WorkspaceMergeEditorModeFactory_1;
-let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
-    constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, _modelService) {
-        this._mergeEditorTelemetry = _mergeEditorTelemetry;
-        this._instantiationService = _instantiationService;
-        this._textModelService = _textModelService;
-        this._modelService = _modelService;
-    }
-    async createInputModel(args) {
-        const store = ( new DisposableStore());
-        const [base, result, input1Data, input2Data,] = await Promise.all([
-            this._textModelService.createModelReference(args.base),
-            this._textModelService.createModelReference(args.result),
-            toInputData(args.input1, this._textModelService, store),
-            toInputData(args.input2, this._textModelService, store),
-        ]);
-        store.add(base);
-        store.add(result);
-        const tempResultUri = result.object.textEditorModel.uri.with({ scheme: 'merge-result' });
-        const temporaryResultModel = this._modelService.createModel('', {
-            languageId: result.object.textEditorModel.getLanguageId(),
-            onDidChange: Event.None,
-        }, tempResultUri);
-        store.add(temporaryResultModel);
-        const mergeDiffComputer = this._instantiationService.createInstance(MergeDiffComputer);
-        const model = this._instantiationService.createInstance(MergeEditorModel, base.object.textEditorModel, input1Data, input2Data, temporaryResultModel, mergeDiffComputer, {
-            resetResult: true,
-        }, this._mergeEditorTelemetry);
-        store.add(model);
-        await model.onInitialized;
-        return this._instantiationService.createInstance(TempFileMergeEditorInputModel, model, store, result.object, args.result);
-    }
-};
-TempFileMergeEditorModeFactory = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, IModelService))
-], TempFileMergeEditorModeFactory));
-let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends EditorModel {
-    constructor(model, disposable, result, resultUri, textFileService, dialogService, editorService) {
-        super();
-        this.model = model;
-        this.disposable = disposable;
-        this.result = result;
-        this.resultUri = resultUri;
-        this.textFileService = textFileService;
-        this.dialogService = dialogService;
-        this.editorService = editorService;
-        this.savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
-        this.altVersionId = observableFromEvent(e => this.model.resultTextModel.onDidChangeContent(e), () =>
-         this.model.resultTextModel.getAlternativeVersionId());
-        this.isDirty = derived(this, (reader) => this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
-        this.finished = false;
-    }
-    dispose() {
-        this.disposable.dispose();
-        super.dispose();
-    }
-    async accept() {
-        const value = await this.model.resultTextModel.getValue();
-        this.result.textEditorModel.setValue(value);
-        this.savedAltVersionId.set(this.model.resultTextModel.getAlternativeVersionId(), undefined);
-        await this.textFileService.save(this.result.textEditorModel.uri);
-        this.finished = true;
-    }
-    async _discard() {
-        await this.textFileService.revert(this.model.resultTextModel.uri);
-        this.savedAltVersionId.set(this.model.resultTextModel.getAlternativeVersionId(), undefined);
-        this.finished = true;
-    }
-    shouldConfirmClose() {
-        return true;
-    }
-    async confirmClose(inputModels) {
-        assertFn(() => ( inputModels.some((m) => m === this)));
-        const someDirty = ( inputModels.some((m) => m.isDirty.get()));
-        let choice;
-        if (someDirty) {
-            const isMany = inputModels.length > 1;
-            const message = isMany
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'messageN',
-                'Do you want keep the merge result of {0} files?',
-                inputModels.length
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'message1',
-                'Do you want keep the merge result of {0}?',
-                basename(inputModels[0].model.resultTextModel.uri)
-            ));
-            const hasUnhandledConflicts = ( inputModels.some((m) => m.model.hasUnhandledConflicts.get()));
-            const buttons = [
-                {
-                    label: hasUnhandledConflicts ?
-                        ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            "&&Save With Conflicts"
-                        )) :
-                        ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'save', comment: ['&& denotes a mnemonic'] },
-                            "&&Save"
-                        )),
-                    run: () => 0
-                },
-                {
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        { key: 'discard', comment: ['&& denotes a mnemonic'] },
-                        "Do&&n't Save"
-                    )),
-                    run: () => 1
-                }
-            ];
-            choice = (await this.dialogService.prompt({
-                type: Severity.Info,
-                message,
-                detail: hasUnhandledConflicts
-                    ? isMany
-                        ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detailNConflicts',
-                    "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
-                ))
-                        : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detail1Conflicts',
-                    "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                ))
-                    : isMany
-                        ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detailN',
-                    "The merge results will be lost if you don't save them."
-                ))
-                        : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'detail1',
-                    "The merge result will be lost if you don't save it."
-                )),
-                buttons,
-                cancelButton: {
-                    run: () => 2
-                }
-            })).result;
-        }
-        else {
-            choice = 1 ;
-        }
-        if (choice === 0 ) {
-            await Promise.all(( inputModels.map(m => m.accept())));
-        }
-        else if (choice === 1 ) {
-            await Promise.all(( inputModels.map(m => m._discard())));
-        }
-        else ;
-        return choice;
-    }
-    async save(options) {
-        if (this.finished) {
-            return;
-        }
-        (async () => {
-            const { confirmed } = await this.dialogService.confirm({
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'saveTempFile.message',
-                    "Do you want to accept the merge result?"
-                )),
-                detail: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'saveTempFile.detail',
-                    "This will write the merge result to the original file and close the merge editor."
-                )),
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'acceptMerge', comment: ['&& denotes a mnemonic'] },
-                    '&&Accept Merge'
-                ))
-            });
-            if (confirmed) {
-                await this.accept();
-                const editors = this.editorService.findEditors(this.resultUri).filter(e => e.editor.typeId === 'mergeEditor.Input');
-                await this.editorService.closeEditors(editors);
-            }
-        })();
-    }
-    async revert(options) {
-    }
-};
-TempFileMergeEditorInputModel = ( __decorate([
-    ( __param(4, ITextFileService)),
-    ( __param(5, IDialogService)),
-    ( __param(6, IEditorService))
-], TempFileMergeEditorInputModel));
-let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
-    static { WorkspaceMergeEditorModeFactory_1 = this; }
-    constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, textFileService) {
-        this._mergeEditorTelemetry = _mergeEditorTelemetry;
-        this._instantiationService = _instantiationService;
-        this._textModelService = _textModelService;
-        this.textFileService = textFileService;
-    }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localizeWithPath(
-        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-        'merge-editor.source',
-        "Before Resolving Conflicts In Merge Editor"
-    ))); }
-    async createInputModel(args) {
-        const store = ( new DisposableStore());
-        let resultTextFileModel = undefined;
-        const modelListener = store.add(( new DisposableStore()));
-        const handleDidCreate = (model) => {
-            if (isEqual(args.result, model.resource)) {
-                modelListener.clear();
-                resultTextFileModel = model;
-            }
-        };
-        modelListener.add(this.textFileService.files.onDidCreate(handleDidCreate));
-        this.textFileService.files.models.forEach(handleDidCreate);
-        const [base, result, input1Data, input2Data,] = await Promise.all([
-            this._textModelService.createModelReference(args.base),
-            this._textModelService.createModelReference(args.result),
-            toInputData(args.input1, this._textModelService, store),
-            toInputData(args.input2, this._textModelService, store),
-        ]);
-        store.add(base);
-        store.add(result);
-        if (!resultTextFileModel) {
-            throw new BugIndicatingError();
-        }
-        await resultTextFileModel.save({ source: WorkspaceMergeEditorModeFactory_1.FILE_SAVED_SOURCE });
-        const lines = resultTextFileModel.textEditorModel.getLinesContent();
-        const hasConflictMarkers = ( lines.some(l => l.startsWith(conflictMarkers.start)));
-        const resetResult = hasConflictMarkers;
-        const mergeDiffComputer = this._instantiationService.createInstance(MergeDiffComputer);
-        const model = this._instantiationService.createInstance(MergeEditorModel, base.object.textEditorModel, input1Data, input2Data, result.object.textEditorModel, mergeDiffComputer, {
-            resetResult
-        }, this._mergeEditorTelemetry);
-        store.add(model);
-        await model.onInitialized;
-        return this._instantiationService.createInstance(WorkspaceMergeEditorInputModel, model, store, resultTextFileModel, this._mergeEditorTelemetry);
-    }
-};
-WorkspaceMergeEditorModeFactory = WorkspaceMergeEditorModeFactory_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, ITextModelService)),
-    ( __param(3, ITextFileService))
-], WorkspaceMergeEditorModeFactory));
-let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extends EditorModel {
-    constructor(model, disposableStore, resultTextFileModel, telemetry, _dialogService, _storageService) {
-        super();
-        this.model = model;
-        this.disposableStore = disposableStore;
-        this.resultTextFileModel = resultTextFileModel;
-        this.telemetry = telemetry;
-        this._dialogService = _dialogService;
-        this._storageService = _storageService;
-        this.isDirty = observableFromEvent(Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError), () =>  this.resultTextFileModel.isDirty());
-        this.reported = false;
-        this.dateTimeOpened = ( new Date());
-    }
-    dispose() {
-        this.disposableStore.dispose();
-        super.dispose();
-        this.reportClose(false);
-    }
-    reportClose(accepted) {
-        if (!this.reported) {
-            const remainingConflictCount = this.model.unhandledConflictsCount.get();
-            const durationOpenedMs = ( new Date()).getTime() - this.dateTimeOpened.getTime();
-            this.telemetry.reportMergeEditorClosed({
-                durationOpenedSecs: durationOpenedMs / 1000,
-                remainingConflictCount,
-                accepted,
-                conflictCount: this.model.conflictCount,
-                combinableConflictCount: this.model.combinableConflictCount,
-                conflictsResolvedWithBase: this.model.conflictsResolvedWithBase,
-                conflictsResolvedWithInput1: this.model.conflictsResolvedWithInput1,
-                conflictsResolvedWithInput2: this.model.conflictsResolvedWithInput2,
-                conflictsResolvedWithSmartCombination: this.model.conflictsResolvedWithSmartCombination,
-                manuallySolvedConflictCountThatEqualNone: this.model.manuallySolvedConflictCountThatEqualNone,
-                manuallySolvedConflictCountThatEqualSmartCombine: this.model.manuallySolvedConflictCountThatEqualSmartCombine,
-                manuallySolvedConflictCountThatEqualInput1: this.model.manuallySolvedConflictCountThatEqualInput1,
-                manuallySolvedConflictCountThatEqualInput2: this.model.manuallySolvedConflictCountThatEqualInput2,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBase: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBase,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithInput1: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithInput1,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithInput2: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithInput2,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBothNonSmart: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBothNonSmart,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBothSmart: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBothSmart,
-            });
-            this.reported = true;
-        }
-    }
-    async accept() {
-        this.reportClose(true);
-        await this.resultTextFileModel.save();
-    }
-    get resultUri() {
-        return this.resultTextFileModel.resource;
-    }
-    async save(options) {
-        await this.resultTextFileModel.save(options);
-    }
-    async revert(options) {
-        await this.resultTextFileModel.revert(options);
-    }
-    shouldConfirmClose() {
-        return true;
-    }
-    async confirmClose(inputModels) {
-        const isMany = inputModels.length > 1;
-        const someDirty = ( inputModels.some(m => m.isDirty.get()));
-        const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
-        if (someDirty) {
-            const message = isMany
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'workspace.messageN',
-                'Do you want to save the changes you made to {0} files?',
-                inputModels.length
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                'workspace.message1',
-                'Do you want to save the changes you made to {0}?',
-                basename(inputModels[0].resultUri)
-            ));
-            const { result } = await this._dialogService.prompt({
-                type: Severity.Info,
-                message,
-                detail: someUnhandledConflicts ?
-                    isMany
-                        ? ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detailN.unhandled',
-                        "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detail1.unhandled',
-                        "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
-                    : isMany
-                        ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.detailN.handled',
-                    "Your changes will be lost if you don't save them."
-                ))
-                        : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.detail1.handled',
-                    "Your changes will be lost if you don't save them."
-                )),
-                buttons: [
-                    {
-                        label: someUnhandledConflicts
-                            ? ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            '&&Save with Conflicts'
-                        ))
-                            : ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.save', comment: ['&& denotes a mnemonic'] },
-                            '&&Save'
-                        )),
-                        run: () => 0
-                    },
-                    {
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                            { key: 'workspace.doNotSave', comment: ['&& denotes a mnemonic'] },
-                            "Do&&n't Save"
-                        )),
-                        run: () => 1
-                    }
-                ],
-                cancelButton: {
-                    run: () => 2
-                }
-            });
-            return result;
-        }
-        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
-            const { confirmed, checkboxChecked } = await this._dialogService.confirm({
-                message: isMany
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.messageN.nonDirty',
-                    'Do you want to close {0} merge editors?',
-                    inputModels.length
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'workspace.message1.nonDirty',
-                    'Do you want to close the merge editor for {0}?',
-                    basename(inputModels[0].resultUri)
-                )),
-                detail: someUnhandledConflicts ?
-                    isMany
-                        ? ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detailN.unhandled.nonDirty',
-                        "The files contain unhandled conflicts."
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                        'workspace.detail1.unhandled.nonDirty',
-                        "The file contains unhandled conflicts."
-                    ))
-                    : undefined,
-                primaryButton: someUnhandledConflicts
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'workspace.closeWithConflicts', comment: ['&& denotes a mnemonic'] },
-                    '&&Close with Conflicts'
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    { key: 'workspace.close', comment: ['&& denotes a mnemonic'] },
-                    '&&Close'
-                )),
-                checkbox: { label: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
-                    'noMoreWarn',
-                    "Don't ask again"
-                )) }
-            });
-            if (checkboxChecked) {
-                this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
-            }
-            return confirmed ? 0  : 2 ;
-        }
-        else {
-            return 0 ;
-        }
-    }
-};
-WorkspaceMergeEditorInputModel = ( __decorate([
-    ( __param(4, IDialogService)),
-    ( __param(5, IStorageService))
-], WorkspaceMergeEditorInputModel));
-async function toInputData(data, textModelService, store) {
-    const ref = await textModelService.createModelReference(data.uri);
-    store.add(ref);
-    return {
-        textModel: ref.object.textEditorModel,
-        title: data.title,
-        description: data.description,
-        detail: data.detail,
-    };
-}
-
-export { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,6 +0,0 @@
-const conflictMarkers = {
-    start: '<<<<<<<',
-    end: '>>>>>>>',
-};
-
-export { conflictMarkers };