@codingame/monaco-vscode-view-common-service-override 8.0.4 → 9.0.0

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

@@ -1,271 +0,0 @@
-import { createStyleSheet, isInShadowDOM, h, $, reset } from 'vscode/vscode/vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { hash } from 'vscode/vscode/vs/base/common/hash';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/arrays';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
-import { localize } from 'vscode/vscode/vs/nls';
-import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { FixedZoneWidget } from './fixedZoneWidget.js';
-
-class ConflictActionsFactory extends Disposable {
-    constructor(_editor) {
-        super();
-        this._editor = _editor;
-        this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.codeLensFontSize) || e.hasChanged(EditorOption.codeLensFontFamily)) {
-                this._updateLensStyle();
-            }
-        }));
-        this._styleClassName = '_conflictActionsFactory_' + ( (hash(this._editor.getId()).toString(16)));
-        this._styleElement = createStyleSheet(isInShadowDOM(this._editor.getContainerDomNode())
-            ? this._editor.getContainerDomNode()
-            : undefined, undefined, this._store);
-        this._updateLensStyle();
-    }
-    _updateLensStyle() {
-        const { codeLensHeight, fontSize } = this._getLayoutInfo();
-        const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
-        const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
-        const fontFamilyVar = `--codelens-font-family${this._styleClassName}`;
-        const fontFeaturesVar = `--codelens-font-features${this._styleClassName}`;
-        let newStyle = `
-		.${this._styleClassName} { line-height: ${codeLensHeight}px; font-size: ${fontSize}px; padding-right: ${Math.round(fontSize * 0.5)}px; font-feature-settings: var(${fontFeaturesVar}) }
-		.monaco-workbench .${this._styleClassName} span.codicon { line-height: ${codeLensHeight}px; font-size: ${fontSize}px; }
-		`;
-        if (fontFamily) {
-            newStyle += `${this._styleClassName} { font-family: var(${fontFamilyVar}), ${EDITOR_FONT_DEFAULTS.fontFamily}}`;
-        }
-        this._styleElement.textContent = newStyle;
-        this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily ?? 'inherit');
-        this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
-    }
-    _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(EditorOption.lineHeight) / this._editor.getOption(EditorOption.fontSize));
-        let fontSize = this._editor.getOption(EditorOption.codeLensFontSize);
-        if (!fontSize || fontSize < 5) {
-            fontSize = (this._editor.getOption(EditorOption.fontSize) * .9) | 0;
-        }
-        return {
-            fontSize,
-            codeLensHeight: (fontSize * lineHeightFactor) | 0,
-        };
-    }
-    createWidget(viewZoneChangeAccessor, lineNumber, items, viewZoneIdsToCleanUp) {
-        const layoutInfo = this._getLayoutInfo();
-        return (
-             (new ActionsContentWidget(
-                this._editor,
-                viewZoneChangeAccessor,
-                lineNumber,
-                layoutInfo.codeLensHeight + 2,
-                this._styleClassName,
-                items,
-                viewZoneIdsToCleanUp
-            ))
-        );
-    }
-}
-class ActionsSource {
-    constructor(viewModel, modifiedBaseRange) {
-        this.viewModel = viewModel;
-        this.modifiedBaseRange = modifiedBaseRange;
-        this.itemsInput1 = this.getItemsInput(1);
-        this.itemsInput2 = this.getItemsInput(2);
-        this.resultItems = derived(this, reader => {
-            const viewModel = this.viewModel;
-            const modifiedBaseRange = this.modifiedBaseRange;
-            const state = viewModel.model.getState(modifiedBaseRange).read(reader);
-            const model = viewModel.model;
-            const result = [];
-            if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push({
-                    text: ( localize(11483, "Manual Resolution")),
-                    tooltip: ( localize(11484, "This conflict has been resolved manually.")),
-                });
-            }
-            else if (state.kind === ModifiedBaseRangeStateKind.base) {
-                result.push({
-                    text: ( localize(11485, 'No Changes Accepted')),
-                    tooltip: ( localize(
-                        11486,
-                        'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
-                    )),
-                });
-            }
-            else {
-                const labels = [];
-                if (state.includesInput1) {
-                    labels.push(model.input1.title);
-                }
-                if (state.includesInput2) {
-                    labels.push(model.input2.title);
-                }
-                if (state.kind === ModifiedBaseRangeStateKind.both && state.firstInput === 2) {
-                    labels.reverse();
-                }
-                result.push({
-                    text: `${labels.join(' + ')}`
-                });
-            }
-            const stateToggles = [];
-            if (state.includesInput1) {
-                stateToggles.push(command(( localize(11487, 'Remove {0}', model.input1.title)), async () => {
-                    transaction((tx) => {
-                        model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
-                        model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
-                    });
-                }, ( localize(11488, 'Remove {0} from the result document.', model.input1.title))));
-            }
-            if (state.includesInput2) {
-                stateToggles.push(command(( localize(11487, 'Remove {0}', model.input2.title)), async () => {
-                    transaction((tx) => {
-                        model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
-                        model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
-                    });
-                }, ( localize(11488, 'Remove {0} from the result document.', model.input2.title))));
-            }
-            if (state.kind === ModifiedBaseRangeStateKind.both &&
-                state.firstInput === 2) {
-                stateToggles.reverse();
-            }
-            result.push(...stateToggles);
-            if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11489, 'Reset to base')), async () => {
-                    transaction((tx) => {
-                        model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
-                        model.telemetry.reportResetToBaseInvoked();
-                    });
-                }, ( localize(
-                    11490,
-                    'Reset this conflict to the common ancestor of both the right and left changes.'
-                ))));
-            }
-            return result;
-        });
-        this.isEmpty = derived(this, reader => {
-            return this.itemsInput1.read(reader).length + this.itemsInput2.read(reader).length + this.resultItems.read(reader).length === 0;
-        });
-        this.inputIsEmpty = derived(this, reader => {
-            return this.itemsInput1.read(reader).length + this.itemsInput2.read(reader).length === 0;
-        });
-    }
-    getItemsInput(inputNumber) {
-        return derived(reader => {
-            const viewModel = this.viewModel;
-            const modifiedBaseRange = this.modifiedBaseRange;
-            if (!viewModel.model.hasBaseRange(modifiedBaseRange)) {
-                return [];
-            }
-            const state = viewModel.model.getState(modifiedBaseRange).read(reader);
-            const handled = viewModel.model.isHandled(modifiedBaseRange).read(reader);
-            const model = viewModel.model;
-            const result = [];
-            const inputData = inputNumber === 1 ? viewModel.model.input1 : viewModel.model.input2;
-            const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
-            if (!modifiedBaseRange.isConflicting && handled && !showNonConflictingChanges) {
-                return [];
-            }
-            const otherInputNumber = inputNumber === 1 ? 2 : 1;
-            if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
-                if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(11491, "Accept {0}", inputData.title)), async () => {
-                        transaction((tx) => {
-                            model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
-                            model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
-                        });
-                    }, ( localize(11492, "Accept {0} in the result document.", inputData.title))));
-                    if (modifiedBaseRange.canBeCombined) {
-                        const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localize(11493, "Accept Combination ({0} First)", inputData.title))
-                            : ( localize(11494, "Accept Combination"));
-                        result.push(command(commandName, async () => {
-                            transaction((tx) => {
-                                model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
-                                    .withInputValue(inputNumber, true)
-                                    .withInputValue(otherInputNumber, true, true), true, tx);
-                                model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
-                            });
-                        }, ( localize(
-                            11495,
-                            "Accept an automatic combination of both sides in the result document."
-                        ))));
-                    }
-                }
-                else {
-                    result.push(command(( localize(11496, "Append {0}", inputData.title)), async () => {
-                        transaction((tx) => {
-                            model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
-                            model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
-                        });
-                    }, ( localize(11497, "Append {0} to the result document.", inputData.title))));
-                    if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11498, "Accept Combination", inputData.title)), async () => {
-                            transaction((tx) => {
-                                model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
-                                model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
-                            });
-                        }, ( localize(
-                            11495,
-                            "Accept an automatic combination of both sides in the result document."
-                        ))));
-                    }
-                }
-                if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11499, 'Ignore')), async () => {
-                        transaction((tx) => {
-                            model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
-                        });
-                    }, ( localize(11500, "Don't take this side of the conflict."))));
-                }
-            }
-            return result;
-        });
-    }
-}
-function command(title, action, tooltip) {
-    return {
-        text: title,
-        action,
-        tooltip,
-    };
-}
-class ActionsContentWidget extends FixedZoneWidget {
-    constructor(editor, viewZoneAccessor, afterLineNumber, height, className, items, viewZoneIdsToCleanUp) {
-        super(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp);
-        this._domNode = h('div.merge-editor-conflict-actions').root;
-        this.widgetDomNode.appendChild(this._domNode);
-        this._domNode.classList.add(className);
-        this._register(autorun(reader => {
-            const i = items.read(reader);
-            this.setState(i);
-        }));
-    }
-    setState(items) {
-        const children = [];
-        let isFirst = true;
-        for (const item of items) {
-            if (isFirst) {
-                isFirst = false;
-            }
-            else {
-                children.push($('span', undefined, '\u00a0|\u00a0'));
-            }
-            const title = renderLabelWithIcons(item.text);
-            if (item.action) {
-                children.push($('a', { title: item.tooltip, role: 'button', onclick: () => item.action() }, ...title));
-            }
-            else {
-                children.push($('span', { title: item.tooltip }, ...title));
-            }
-        }
-        reset(this._domNode, ...children);
-    }
-}
-
-export { ActionsSource, ConflictActionsFactory };

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

@@ -1,41 +0,0 @@
-import { h } from 'vscode/vscode/vs/base/browser/dom';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-
-class FixedZoneWidget extends Disposable {
-    static { this.counter = 0; }
-    constructor(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp) {
-        super();
-        this.editor = editor;
-        this.overlayWidgetId = `fixedZoneWidget-${FixedZoneWidget.counter++}`;
-        this.widgetDomNode = h('div.fixed-zone-widget').root;
-        this.overlayWidget = {
-            getId: () => this.overlayWidgetId,
-            getDomNode: () => this.widgetDomNode,
-            getPosition: () => null
-        };
-        this.viewZoneId = viewZoneAccessor.addZone({
-            domNode: document.createElement('div'),
-            afterLineNumber: afterLineNumber,
-            heightInPx: height,
-            onComputedHeight: (height) => {
-                this.widgetDomNode.style.height = `${height}px`;
-            },
-            onDomNodeTop: (top) => {
-                this.widgetDomNode.style.top = `${top}px`;
-            }
-        });
-        viewZoneIdsToCleanUp.push(this.viewZoneId);
-        this._register(Event.runAndSubscribe(this.editor.onDidLayoutChange, () => {
-            this.widgetDomNode.style.left = this.editor.getLayoutInfo().contentLeft + 'px';
-        }));
-        this.editor.addOverlayWidget(this.overlayWidget);
-        this._register({
-            dispose: () => {
-                this.editor.removeOverlayWidget(this.overlayWidget);
-            },
-        });
-    }
-}
-
-export { FixedZoneWidget };