@codingame/monaco-vscode-api 2.1.4 → 2.2.0-next.1

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

@@ -0,0 +1,691 @@
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
+import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import '../../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IStorageService } from '../../../../../platform/storage/common/storage.js';
+import { MergeEditorInputData } from '../mergeEditorInput.js';
+import { MergeEditor } from '../view/mergeEditor.js';
+import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from '../../common/mergeEditor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+class MergeEditorAction extends Action2 {
+    constructor(desc) {
+        super(desc);
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            const vm = activeEditorPane.viewModel.get();
+            if (!vm) {
+                return;
+            }
+            this.runWithViewModel(vm, accessor);
+        }
+    }
+}
+class MergeEditorAction2 extends Action2 {
+    constructor(desc) {
+        super(desc);
+    }
+    run(accessor, ...args) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            const vm = activeEditorPane.viewModel.get();
+            if (!vm) {
+                return;
+            }
+            return this.runWithMergeEditor({
+                viewModel: vm,
+                inputModel: activeEditorPane.inputModel.get(),
+                input: activeEditorPane.input,
+                editorIdentifier: {
+                    editor: activeEditorPane.input,
+                    groupId: activeEditorPane.group.id,
+                }
+            }, accessor, ...args);
+        }
+    }
+}
+class OpenMergeEditor extends Action2 {
+    constructor() {
+        super({
+            id: '_open.mergeEditor',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'title',
+                'Open Merge Editor'
+            )),
+        });
+    }
+    run(accessor, ...args) {
+        const validatedArgs = IRelaxedOpenArgs.validate(args[0]);
+        const input = {
+            base: { resource: validatedArgs.base },
+            input1: { resource: validatedArgs.input1.uri, label: validatedArgs.input1.title, description: validatedArgs.input1.description, detail: validatedArgs.input1.detail },
+            input2: { resource: validatedArgs.input2.uri, label: validatedArgs.input2.title, description: validatedArgs.input2.description, detail: validatedArgs.input2.detail },
+            result: { resource: validatedArgs.output },
+            options: { preserveFocus: true }
+        };
+        accessor.get(IEditorService).openEditor(input);
+    }
+}
+var IRelaxedOpenArgs;
+( (function(IRelaxedOpenArgs) {
+    function validate(obj) {
+        if (!obj || typeof obj !== 'object') {
+            throw new TypeError('invalid argument');
+        }
+        const o = obj;
+        const base = toUri(o.base);
+        const output = toUri(o.output);
+        const input1 = toInputData(o.input1);
+        const input2 = toInputData(o.input2);
+        return { base, input1, input2, output };
+    }
+    IRelaxedOpenArgs.validate = validate;
+    function toInputData(obj) {
+        if (typeof obj === 'string') {
+            return ( new MergeEditorInputData(( URI.parse(obj, true)), undefined, undefined, undefined));
+        }
+        if (!obj || typeof obj !== 'object') {
+            throw new TypeError('invalid argument');
+        }
+        if (isUriComponents(obj)) {
+            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));
+    }
+    function toUri(obj) {
+        if (typeof obj === 'string') {
+            return ( URI.parse(obj, true));
+        }
+        else if (obj && typeof obj === 'object') {
+            return URI.revive(obj);
+        }
+        throw new TypeError('invalid argument');
+    }
+    function isUriComponents(obj) {
+        if (!obj || typeof obj !== 'object') {
+            return false;
+        }
+        const o = obj;
+        return typeof o.scheme === 'string'
+            && typeof o.authority === 'string'
+            && typeof o.path === 'string'
+            && typeof o.query === 'string'
+            && typeof o.fragment === 'string';
+    }
+})(IRelaxedOpenArgs || (IRelaxedOpenArgs = {})));
+class SetMixedLayout extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.mixedLayout',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'layout.mixed',
+                    'Mixed Layout'
+                )),
+                original: 'Mixed Layout',
+            },
+            toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: '1_merge',
+                    order: 9,
+                },
+            ],
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.setLayoutKind('mixed');
+        }
+    }
+}
+class SetColumnLayout extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.columnLayout',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'layout.column',
+                'Column Layout'
+            )),
+            toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
+            menu: [{
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: '1_merge',
+                    order: 10,
+                }],
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.setLayoutKind('columns');
+        }
+    }
+}
+class ShowNonConflictingChanges extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.showNonConflictingChanges',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'showNonConflictingChanges',
+                    'Show Non-Conflicting Changes'
+                )),
+                original: 'Show Non-Conflicting Changes',
+            },
+            toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: '3_merge',
+                    order: 9,
+                },
+            ],
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.toggleShowNonConflictingChanges();
+        }
+    }
+}
+class ShowHideBase extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.showBase',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'layout.showBase',
+                    'Show Base'
+                )),
+                original: 'Show Base',
+            },
+            toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('columns')))),
+                    group: '2_merge',
+                    order: 9,
+                },
+            ]
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.toggleBase();
+        }
+    }
+}
+class ShowHideTopBase extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.showBaseTop',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'layout.showBaseTop',
+                    'Show Base Top'
+                )),
+                original: 'Show Base Top',
+            },
+            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
+                    group: '2_merge',
+                    order: 10,
+                },
+            ],
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.toggleShowBaseTop();
+        }
+    }
+}
+class ShowHideCenterBase extends Action2 {
+    constructor() {
+        super({
+            id: 'merge.showBaseCenter',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'layout.showBaseCenter',
+                    'Show Base Center'
+                )),
+                original: 'Show Base Center',
+            },
+            toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ( ContextKeyExpr.and(ctxIsMergeEditor, ( ctxMergeEditorLayout.isEqualTo('mixed')))),
+                    group: '2_merge',
+                    order: 11,
+                },
+            ],
+        });
+    }
+    run(accessor) {
+        const { activeEditorPane } = accessor.get(IEditorService);
+        if (activeEditorPane instanceof MergeEditor) {
+            activeEditorPane.toggleShowBaseCenter();
+        }
+    }
+}
+const mergeEditorCategory = {
+    value: ( localizeWithPath(
+        'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+        'mergeEditor',
+        'Merge Editor'
+    )),
+    original: 'Merge Editor',
+};
+class OpenResultResource extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.openResult',
+            icon: Codicon.goToFile,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'openfile',
+                    'Open File'
+                )),
+                original: 'Open File',
+            },
+            category: mergeEditorCategory,
+            menu: [{
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: 'navigation',
+                    order: 1,
+                }],
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel, accessor) {
+        const editorService = accessor.get(IEditorService);
+        editorService.openEditor({ resource: viewModel.model.resultTextModel.uri });
+    }
+}
+class GoToNextUnhandledConflict extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.goToNextUnhandledConflict',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.goToNextUnhandledConflict',
+                    'Go to Next Unhandled Conflict'
+                )),
+                original: 'Go to Next Unhandled Conflict',
+            },
+            icon: Codicon.arrowDown,
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: 'navigation',
+                    order: 3
+                },
+            ],
+            f1: true,
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.model.telemetry.reportNavigationToNextConflict();
+        viewModel.goToNextModifiedBaseRange(r => !viewModel.model.isHandled(r).get());
+    }
+}
+class GoToPreviousUnhandledConflict extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.goToPreviousUnhandledConflict',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.goToPreviousUnhandledConflict',
+                    'Go to Previous Unhandled Conflict'
+                )),
+                original: 'Go to Previous Unhandled Conflict',
+            },
+            icon: Codicon.arrowUp,
+            menu: [
+                {
+                    id: MenuId.EditorTitle,
+                    when: ctxIsMergeEditor,
+                    group: 'navigation',
+                    order: 2
+                },
+            ],
+            f1: true,
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.model.telemetry.reportNavigationToPreviousConflict();
+        viewModel.goToPreviousModifiedBaseRange(r => !viewModel.model.isHandled(r).get());
+    }
+}
+class ToggleActiveConflictInput1 extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.toggleActiveConflictInput1',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.toggleCurrentConflictFromLeft',
+                    'Toggle Current Conflict from Left'
+                )),
+                original: 'Toggle Current Conflict from Left',
+            },
+            f1: true,
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.toggleActiveConflict(1);
+    }
+}
+class ToggleActiveConflictInput2 extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.toggleActiveConflictInput2',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.toggleCurrentConflictFromRight',
+                    'Toggle Current Conflict from Right'
+                )),
+                original: 'Toggle Current Conflict from Right',
+            },
+            f1: true,
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.toggleActiveConflict(2);
+    }
+}
+class CompareInput1WithBaseCommand extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'mergeEditor.compareInput1WithBase',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.compareInput1WithBase',
+                    'Compare Input 1 With Base'
+                )),
+                original: 'Compare Input 1 With Base',
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.compareWithBase',
+                'Compare With Base'
+            )),
+            f1: true,
+            precondition: ctxIsMergeEditor,
+            menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
+            icon: Codicon.compareChanges,
+        });
+    }
+    runWithViewModel(viewModel, accessor) {
+        const editorService = accessor.get(IEditorService);
+        mergeEditorCompare(viewModel, editorService, 1);
+    }
+}
+class CompareInput2WithBaseCommand extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'mergeEditor.compareInput2WithBase',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.compareInput2WithBase',
+                    'Compare Input 2 With Base'
+                )),
+                original: 'Compare Input 2 With Base',
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.compareWithBase',
+                'Compare With Base'
+            )),
+            f1: true,
+            precondition: ctxIsMergeEditor,
+            menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
+            icon: Codicon.compareChanges,
+        });
+    }
+    runWithViewModel(viewModel, accessor) {
+        const editorService = accessor.get(IEditorService);
+        mergeEditorCompare(viewModel, editorService, 2);
+    }
+}
+async function mergeEditorCompare(viewModel, editorService, inputNumber) {
+    editorService.openEditor(editorService.activeEditor, { pinned: true });
+    const model = viewModel.model;
+    const base = model.base;
+    const input = inputNumber === 1 ? viewModel.inputCodeEditorView1.editor : viewModel.inputCodeEditorView2.editor;
+    const lineNumber = input.getPosition().lineNumber;
+    await editorService.openEditor({
+        original: { resource: base.uri },
+        modified: { resource: input.getModel().uri },
+        options: {
+            selection: {
+                startLineNumber: lineNumber,
+                startColumn: 1,
+            },
+            revealIfOpened: true,
+            revealIfVisible: true,
+        }
+    });
+}
+class OpenBaseFile extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.openBaseEditor',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.openBaseEditor',
+                    'Open Base File'
+                )),
+                original: 'Open Base File',
+            },
+            f1: true,
+            precondition: ctxIsMergeEditor,
+        });
+    }
+    runWithViewModel(viewModel, accessor) {
+        const openerService = accessor.get(IOpenerService);
+        openerService.open(viewModel.model.base.uri);
+    }
+}
+class AcceptAllInput1 extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.acceptAllInput1',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.acceptAllInput1',
+                    'Accept All Changes from Left'
+                )),
+                original: 'Accept All Changes from Left',
+            },
+            f1: true,
+            precondition: ctxIsMergeEditor,
+            menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
+            icon: Codicon.checkAll,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.acceptAll(1);
+    }
+}
+class AcceptAllInput2 extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'merge.acceptAllInput2',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'merge.acceptAllInput2',
+                    'Accept All Changes from Right'
+                )),
+                original: 'Accept All Changes from Right',
+            },
+            f1: true,
+            precondition: ctxIsMergeEditor,
+            menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
+            icon: Codicon.checkAll,
+        });
+    }
+    runWithViewModel(viewModel) {
+        viewModel.acceptAll(2);
+    }
+}
+class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
+    constructor() {
+        super({
+            id: 'mergeEditor.resetResultToBaseAndAutoMerge',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.resetResultToBaseAndAutoMerge',
+                    'Reset Result'
+                )),
+                original: 'Reset Result',
+            },
+            shortTitle: ( localizeWithPath(
+                'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                'mergeEditor.resetResultToBaseAndAutoMerge.short',
+                'Reset'
+            )),
+            f1: true,
+            precondition: ctxIsMergeEditor,
+            menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
+            icon: Codicon.discard,
+        });
+    }
+    runWithViewModel(viewModel, accessor) {
+        viewModel.model.reset();
+    }
+}
+class ResetCloseWithConflictsChoice extends Action2 {
+    constructor() {
+        super({
+            id: 'mergeEditor.resetCloseWithConflictsChoice',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.resetChoice',
+                    'Reset Choice for \'Close with Conflicts\''
+                )),
+                original: 'Reset Choice for \'Close with Conflicts\'',
+            },
+            f1: true,
+        });
+    }
+    run(accessor) {
+        accessor.get(IStorageService).remove(StorageCloseWithConflicts, 0 );
+    }
+}
+class AcceptMerge extends MergeEditorAction2 {
+    constructor() {
+        super({
+            id: 'mergeEditor.acceptMerge',
+            category: mergeEditorCategory,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.acceptMerge',
+                    'Complete Merge'
+                )),
+                original: 'Complete Merge',
+            },
+            f1: false,
+            precondition: ctxIsMergeEditor
+        });
+    }
+    async runWithMergeEditor({ inputModel, editorIdentifier, viewModel }, accessor) {
+        const dialogService = accessor.get(IDialogService);
+        const editorService = accessor.get(IEditorService);
+        if (viewModel.model.unhandledConflictsCount.get() > 0) {
+            const { confirmed } = await dialogService.confirm({
+                message: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.acceptMerge.unhandledConflicts.message',
+                    "Do you want to complete the merge of {0}?",
+                    basename(inputModel.resultUri)
+                )),
+                detail: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    'mergeEditor.acceptMerge.unhandledConflicts.detail',
+                    "The file contains unhandled conflicts."
+                )),
+                primaryButton: ( localizeWithPath(
+                    'vs/workbench/contrib/mergeEditor/browser/commands/commands',
+                    { key: 'mergeEditor.acceptMerge.unhandledConflicts.accept', comment: ['&& denotes a mnemonic'] },
+                    "&&Complete with Conflicts"
+                ))
+            });
+            if (!confirmed) {
+                return {
+                    successful: false
+                };
+            }
+        }
+        await inputModel.accept();
+        await editorService.closeEditor(editorIdentifier);
+        return {
+            successful: true
+        };
+    }
+}
+export { AcceptAllInput1, AcceptAllInput2, AcceptMerge, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, OpenBaseFile, OpenMergeEditor, OpenResultResource, ResetCloseWithConflictsChoice, ResetToBaseAndAutoMergeCommand, SetColumnLayout, SetMixedLayout, ShowHideBase, ShowHideCenterBase, ShowHideTopBase, ShowNonConflictingChanges, ToggleActiveConflictInput1, ToggleActiveConflictInput2 };