@codingame/monaco-vscode-api 4.4.0 → 4.5.0-improve-code-splitting.1

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

@@ -1,104 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { h } from '../../../../../../base/browser/dom.js';
-import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
-import '../../../../../../base/common/cancellation.js';
-import { EditorExtensionsRegistry } from '../../../../../../editor/browser/editorExtensions.js';
-import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
-import { Selection } from '../../../../../../editor/common/core/selection.js';
-import { CodeLensContribution } from '../../../../../../editor/contrib/codelens/browser/codelensController.js';
-import { FoldingController } from '../../../../../../editor/contrib/folding/browser/folding.js';
-import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from '../../../../../browser/parts/editor/editor.js';
-import { setStyle, observableConfigValue } from '../../utils.js';
-class CodeEditorView extends Disposable {
-    updateOptions(newOptions) {
-        this.editor.updateOptions(newOptions);
-    }
-    constructor(instantiationService, viewModel, configurationService) {
-        super();
-        this.instantiationService = instantiationService;
-        this.viewModel = viewModel;
-        this.configurationService = configurationService;
-        this.model = ( this.viewModel.map(m =>  m?.model));
-        this.htmlElements = h('div.code-view', [
-            h('div.header@header', [
-                h('span.title@title'),
-                h('span.description@description'),
-                h('span.detail@detail'),
-                h('span.toolbar@toolbar'),
-            ]),
-            h('div.container', [
-                h('div.gutter@gutterDiv'),
-                h('div@editor'),
-            ]),
-        ]);
-        this._onDidViewChange = ( new Emitter());
-        this.view = {
-            element: this.htmlElements.root,
-            minimumWidth: DEFAULT_EDITOR_MIN_DIMENSIONS.width,
-            maximumWidth: DEFAULT_EDITOR_MAX_DIMENSIONS.width,
-            minimumHeight: DEFAULT_EDITOR_MIN_DIMENSIONS.height,
-            maximumHeight: DEFAULT_EDITOR_MAX_DIMENSIONS.height,
-            onDidChange: this._onDidViewChange.event,
-            layout: (width, height, top, left) => {
-                setStyle(this.htmlElements.root, { width, height, top, left });
-                this.editor.layout({
-                    width: width - this.htmlElements.gutterDiv.clientWidth,
-                    height: height - this.htmlElements.header.clientHeight,
-                });
-            }
-        };
-        this.checkboxesVisible = observableConfigValue('mergeEditor.showCheckboxes', false, this.configurationService);
-        this.showDeletionMarkers = observableConfigValue('mergeEditor.showDeletionMarkers', true, this.configurationService);
-        this.useSimplifiedDecorations = observableConfigValue('mergeEditor.useSimplifiedDecorations', false, this.configurationService);
-        this.editor = this.instantiationService.createInstance(CodeEditorWidget, this.htmlElements.editor, {}, {
-            contributions: this.getEditorContributions(),
-        });
-        this.isFocused = observableFromEvent(Event.any(this.editor.onDidBlurEditorWidget, this.editor.onDidFocusEditorWidget), () =>  this.editor.hasWidgetFocus());
-        this.cursorPosition = observableFromEvent(this.editor.onDidChangeCursorPosition, () =>  this.editor.getPosition());
-        this.selection = observableFromEvent(this.editor.onDidChangeCursorSelection, () =>  this.editor.getSelections());
-        this.cursorLineNumber = ( this.cursorPosition.map(p =>  p?.lineNumber));
-    }
-    getEditorContributions() {
-        return EditorExtensionsRegistry.getEditorContributions().filter(c => c.id !== FoldingController.ID && c.id !== CodeLensContribution.ID);
-    }
-}
-function createSelectionsAutorun(codeEditorView, translateRange) {
-    const selections = derived(reader => {
-        const viewModel = codeEditorView.viewModel.read(reader);
-        if (!viewModel) {
-            return [];
-        }
-        const baseRange = viewModel.selectionInBase.read(reader);
-        if (!baseRange || baseRange.sourceEditor === codeEditorView) {
-            return [];
-        }
-        return ( baseRange.rangesInBase.map(r => translateRange(r, viewModel)));
-    });
-    return autorun(reader => {
-        const ranges = selections.read(reader);
-        if (ranges.length === 0) {
-            return;
-        }
-        codeEditorView.editor.setSelections(( ranges.map(r => ( new Selection(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn)))));
-    });
-}
-let TitleMenu = class TitleMenu extends Disposable {
-    constructor(menuId, targetHtmlElement, instantiationService) {
-        super();
-        const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, targetHtmlElement, menuId, {
-            menuOptions: { renderShortTitle: true },
-            toolbarOptions: { primaryGroup: (g) => g === 'primary' }
-        });
-        this._store.add(toolbar);
-    }
-};
-TitleMenu = ( __decorate([
-    ( __param(2, IInstantiationService))
-], TitleMenu));
-export { CodeEditorView, TitleMenu, createSelectionsAutorun };

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

@@ -1,401 +0,0 @@
-import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { addDisposableListener, EventType, h, reset } from '../../../../../../base/browser/dom.js';
-import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
-import { Separator, Action } from '../../../../../../base/common/actions.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { clamp } from '../../../../../../base/common/numbers.js';
-import { observableValue, transaction } from '../../../../../../base/common/observableInternal/base.js';
-import { derivedOpts, derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorunOpts, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../../base/common/observableInternal/utils.js';
-import '../../../../../../base/common/cancellation.js';
-import { noBreakWhitespace } from '../../../../../../base/common/strings.js';
-import { isDefined } from '../../../../../../base/common/types.js';
-import { OverviewRulerLane } from '../../../../../../editor/common/model.js';
-import { localizeWithPath } from '../../../../../../nls.js';
-import { MenuId } from '../../../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { defaultToggleStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
-import { applyObservableDecorations, setFields } from '../../utils.js';
-import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
-import { EditorGutter } from '../editorGutter.js';
-import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
-let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
-    constructor(inputNumber, viewModel, instantiationService, contextMenuService, configurationService) {
-        super(instantiationService, viewModel, configurationService);
-        this.inputNumber = inputNumber;
-        this.otherInputNumber = this.inputNumber === 1 ? 2 : 1;
-        this.modifiedBaseRangeGutterItemInfos = derivedOpts({ debugName: `input${this.inputNumber}.modifiedBaseRangeGutterItemInfos` }, reader => {
-            const viewModel = this.viewModel.read(reader);
-            if (!viewModel) {
-                return [];
-            }
-            const model = viewModel.model;
-            const inputNumber = this.inputNumber;
-            const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
-            return ( model.modifiedBaseRanges.read(reader)
-                .filter((r) => r.getInputDiffs(this.inputNumber).length > 0 && (showNonConflictingChanges || r.isConflicting || !model.isHandled(r).read(reader)))
-                .map((baseRange, idx) => ( new ModifiedBaseRangeGutterItemModel(( idx.toString()), baseRange, inputNumber, viewModel))));
-        });
-        this.decorations = derivedOpts({ debugName: `input${this.inputNumber}.decorations` }, reader => {
-            const viewModel = this.viewModel.read(reader);
-            if (!viewModel) {
-                return [];
-            }
-            const model = viewModel.model;
-            const textModel = (this.inputNumber === 1 ? model.input1 : model.input2).textModel;
-            const activeModifiedBaseRange = viewModel.activeModifiedBaseRange.read(reader);
-            const result = ( new Array());
-            const showNonConflictingChanges = viewModel.showNonConflictingChanges.read(reader);
-            const showDeletionMarkers = this.showDeletionMarkers.read(reader);
-            const diffWithThis = viewModel.baseCodeEditorView.read(reader) !== undefined && viewModel.baseShowDiffAgainst.read(reader) === this.inputNumber;
-            const useSimplifiedDecorations = !diffWithThis && this.useSimplifiedDecorations.read(reader);
-            for (const modifiedBaseRange of model.modifiedBaseRanges.read(reader)) {
-                const range = modifiedBaseRange.getInputRange(this.inputNumber);
-                if (!range) {
-                    continue;
-                }
-                const blockClassNames = ['merge-editor-block'];
-                let blockPadding = [0, 0, 0, 0];
-                const isHandled = model.isInputHandled(modifiedBaseRange, this.inputNumber).read(reader);
-                if (isHandled) {
-                    blockClassNames.push('handled');
-                }
-                if (modifiedBaseRange === activeModifiedBaseRange) {
-                    blockClassNames.push('focused');
-                    blockPadding = [0, 2, 0, 2];
-                }
-                if (modifiedBaseRange.isConflicting) {
-                    blockClassNames.push('conflicting');
-                }
-                const inputClassName = this.inputNumber === 1 ? 'input i1' : 'input i2';
-                blockClassNames.push(inputClassName);
-                if (!modifiedBaseRange.isConflicting && !showNonConflictingChanges && isHandled) {
-                    continue;
-                }
-                if (useSimplifiedDecorations && !isHandled) {
-                    blockClassNames.push('use-simplified-decorations');
-                }
-                result.push({
-                    range: range.toInclusiveRangeOrEmpty(),
-                    options: {
-                        showIfCollapsed: true,
-                        blockClassName: blockClassNames.join(' '),
-                        blockPadding,
-                        blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
-                        description: 'Merge Editor',
-                        minimap: {
-                            position: 2 ,
-                            color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
-                        },
-                        overviewRuler: modifiedBaseRange.isConflicting ? {
-                            position: OverviewRulerLane.Center,
-                            color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
-                        } : undefined
-                    }
-                });
-                if (!useSimplifiedDecorations && (modifiedBaseRange.isConflicting || !model.isHandled(modifiedBaseRange).read(reader))) {
-                    const inputDiffs = modifiedBaseRange.getInputDiffs(this.inputNumber);
-                    for (const diff of inputDiffs) {
-                        const range = diff.outputRange.toInclusiveRange();
-                        if (range) {
-                            result.push({
-                                range,
-                                options: {
-                                    className: `merge-editor-diff ${inputClassName}`,
-                                    description: 'Merge Editor',
-                                    isWholeLine: true,
-                                }
-                            });
-                        }
-                        if (diff.rangeMappings) {
-                            for (const d of diff.rangeMappings) {
-                                if (showDeletionMarkers || !d.outputRange.isEmpty()) {
-                                    result.push({
-                                        range: d.outputRange,
-                                        options: {
-                                            className: d.outputRange.isEmpty() ? `merge-editor-diff-empty-word ${inputClassName}` : `merge-editor-diff-word ${inputClassName}`,
-                                            description: 'Merge Editor',
-                                            showIfCollapsed: true,
-                                        }
-                                    });
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return result;
-        });
-        this.htmlElements.root.classList.add(`input`);
-        this._register(( new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
-            getIntersectingGutterItems: (range, reader) => {
-                if (this.checkboxesVisible.read(reader)) {
-                    return this.modifiedBaseRangeGutterItemInfos.read(reader);
-                }
-                else {
-                    return [];
-                }
-            },
-            createView: (item, target) => ( new MergeConflictGutterItemView(item, target, contextMenuService)),
-        })));
-        this._register(createSelectionsAutorun(this, (baseRange, viewModel) => viewModel.model.translateBaseRangeToInput(this.inputNumber, baseRange)));
-        this._register(instantiationService.createInstance(TitleMenu, inputNumber === 1 ? MenuId.MergeInput1Toolbar : MenuId.MergeInput2Toolbar, this.htmlElements.toolbar));
-        this._register(autorunOpts({ debugName: `input${this.inputNumber}: update labels & text model` }, reader => {
-            const vm = this.viewModel.read(reader);
-            if (!vm) {
-                return;
-            }
-            this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
-            const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'input1',
-                'Input 1'
-            ))
-                : vm.model.input2.title || ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'input2',
-                'Input 2'
-            ));
-            const description = this.inputNumber === 1
-                ? vm.model.input1.description
-                : vm.model.input2.description;
-            const detail = this.inputNumber === 1
-                ? vm.model.input1.detail
-                : vm.model.input2.detail;
-            reset(this.htmlElements.title, ...renderLabelWithIcons(title));
-            reset(this.htmlElements.description, ...(description ? renderLabelWithIcons(description) : []));
-            reset(this.htmlElements.detail, ...(detail ? renderLabelWithIcons(detail) : []));
-        }));
-        this._register(applyObservableDecorations(this.editor, this.decorations));
-    }
-};
-InputCodeEditorView = ( __decorate([
-    ( __param(2, IInstantiationService)),
-    ( __param(3, IContextMenuService)),
-    ( __param(4, IConfigurationService))
-], InputCodeEditorView));
-class ModifiedBaseRangeGutterItemModel {
-    constructor(id, baseRange, inputNumber, viewModel) {
-        this.id = id;
-        this.baseRange = baseRange;
-        this.inputNumber = inputNumber;
-        this.viewModel = viewModel;
-        this.model = this.viewModel.model;
-        this.range = this.baseRange.getInputRange(this.inputNumber);
-        this.enabled = this.model.isUpToDate;
-        this.toggleState = derived(this, reader => {
-            const input = this.model
-                .getState(this.baseRange)
-                .read(reader)
-                .getInput(this.inputNumber);
-            return input === 2  && !this.baseRange.isOrderRelevant
-                ? 1
-                : input;
-        });
-        this.state = derived(this, reader => {
-            const active = this.viewModel.activeModifiedBaseRange.read(reader);
-            if (!this.model.hasBaseRange(this.baseRange)) {
-                return { handled: false, focused: false };
-            }
-            return {
-                handled: this.model.isHandled(this.baseRange).read(reader),
-                focused: this.baseRange === active,
-            };
-        });
-    }
-    setState(value, tx) {
-        this.viewModel.setState(this.baseRange, this.model
-            .getState(this.baseRange)
-            .get()
-            .withInputValue(this.inputNumber, value), tx, this.inputNumber);
-    }
-    toggleBothSides() {
-        transaction(tx => {
-            const state = this.model
-                .getState(this.baseRange)
-                .get();
-            this.model.setState(this.baseRange, state
-                .toggle(this.inputNumber)
-                .toggle(this.inputNumber === 1 ? 2 : 1), true, tx);
-        });
-    }
-    getContextMenuActions() {
-        const state = this.model.getState(this.baseRange).get();
-        const handled = this.model.isHandled(this.baseRange).get();
-        const update = (newState) => {
-            transaction(tx => {
-                return this.viewModel.setState(this.baseRange, newState, tx, this.inputNumber);
-            });
-        };
-        function action(id, label, targetState, checked) {
-            const action = ( new Action(id, label, undefined, true, () => {
-                update(targetState);
-            }));
-            action.checked = checked;
-            return action;
-        }
-        const both = state.includesInput1 && state.includesInput2;
-        return [
-            this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.accept',
-                'Accept {0}',
-                this.model.input1.title
-            )), state.toggle(1), state.includesInput1)
-                : undefined,
-            this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.accept',
-                'Accept {0}',
-                this.model.input2.title
-            )), state.toggle(2), state.includesInput2)
-                : undefined,
-            this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.acceptBoth',
-                'Accept Both'
-            )), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
-                : undefined,
-            ( new Separator()),
-            this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.swap',
-                'Swap'
-            )), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
-                : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localizeWithPath(
-                'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                'mergeEditor.markAsHandled',
-                'Mark as Handled'
-            )), undefined, true, () => {
-                transaction((tx) => {
-                    this.model.setHandled(this.baseRange, !handled, tx);
-                });
-            })), { checked: handled }),
-        ].filter(isDefined);
-    }
-}
-class MergeConflictGutterItemView extends Disposable {
-    constructor(item, target, contextMenuService) {
-        super();
-        this.isMultiLine = observableValue(this, false);
-        this.item = observableValue(this, item);
-        const checkBox = ( new Toggle({
-            isChecked: false,
-            title: '',
-            icon: Codicon.check,
-            ...defaultToggleStyles
-        }));
-        checkBox.domNode.classList.add('accept-conflict-group');
-        this._register(addDisposableListener(checkBox.domNode, EventType.MOUSE_DOWN, (e) => {
-            const item = this.item.get();
-            if (!item) {
-                return;
-            }
-            if (e.button ===  2) {
-                e.stopPropagation();
-                e.preventDefault();
-                contextMenuService.showContextMenu({
-                    getAnchor: () => checkBox.domNode,
-                    getActions: () => item.getContextMenuActions(),
-                });
-            }
-            else if (e.button ===  1) {
-                e.stopPropagation();
-                e.preventDefault();
-                item.toggleBothSides();
-            }
-        }));
-        this._register(autorun(reader => {
-            const item = this.item.read(reader);
-            const value = item.toggleState.read(reader);
-            const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.excluded',
-                    "Accept"
-                )) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.conflicting',
-                    "Accept (result is dirty)"
-                )) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.first',
-                    "Undo accept"
-                )) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(
-                    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView',
-                    'accept.second',
-                    "Undo accept (currently second)"
-                )) },
-            };
-            const state = iconMap[value];
-            checkBox.setIcon(state.icon);
-            checkBox.checked = state.checked;
-            checkBox.setTitle(state.title);
-            if (!item.enabled.read(reader)) {
-                checkBox.disable();
-            }
-            else {
-                checkBox.enable();
-            }
-        }));
-        this._register(autorun(reader => {
-            const state = this.item.read(reader).state.read(reader);
-            const classNames = [
-                'merge-accept-gutter-marker',
-                state.handled && 'handled',
-                state.focused && 'focused',
-                this.isMultiLine.read(reader) ? 'multi-line' : 'single-line',
-            ];
-            target.className = classNames.filter(c => typeof c === 'string').join(' ');
-        }));
-        this._register(checkBox.onChange(() => {
-            transaction(tx => {
-                this.item.get().setState(checkBox.checked, tx);
-            });
-        }));
-        target.appendChild(h('div.background', [noBreakWhitespace]).root);
-        target.appendChild(this.checkboxDiv = h('div.checkbox', [h('div.checkbox-background', [checkBox.domNode])]).root);
-    }
-    layout(top, height, viewTop, viewHeight) {
-        const checkboxHeight = this.checkboxDiv.clientHeight;
-        const middleHeight = height / 2 - checkboxHeight / 2;
-        const margin = checkboxHeight;
-        let effectiveCheckboxTop = top + middleHeight;
-        const preferredViewPortRange = [
-            margin,
-            viewTop + viewHeight - margin - checkboxHeight
-        ];
-        const preferredParentRange = [
-            top + margin,
-            top + height - checkboxHeight - margin
-        ];
-        if (preferredParentRange[0] < preferredParentRange[1]) {
-            effectiveCheckboxTop = clamp(effectiveCheckboxTop, preferredViewPortRange[0], preferredViewPortRange[1]);
-            effectiveCheckboxTop = clamp(effectiveCheckboxTop, preferredParentRange[0], preferredParentRange[1]);
-        }
-        this.checkboxDiv.style.top = `${effectiveCheckboxTop - top}px`;
-        transaction((tx) => {
-            this.isMultiLine.set(height > 30, tx);
-        });
-    }
-    update(baseRange) {
-        transaction(tx => {
-            this.item.set(baseRange, tx);
-        });
-    }
-}
-export { InputCodeEditorView, MergeConflictGutterItemView, ModifiedBaseRangeGutterItemModel };