@codingame/monaco-vscode-api 2.0.0-rework-ci.1 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "2.0.0-rework-ci.1",
+  "version": "2.0.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -96,12 +96,12 @@
   "dependencies": {
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-extensions-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-files-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-host-service-override": "2.0.0-rework-ci.1",
-    "@codingame/monaco-vscode-base-service-override": "2.0.0-rework-ci.1"
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.0",
+    "@codingame/monaco-vscode-files-service-override": "2.0.0",
+    "@codingame/monaco-vscode-extensions-service-override": "2.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "2.0.0",
+    "@codingame/monaco-vscode-layout-service-override": "2.0.0",
+    "@codingame/monaco-vscode-host-service-override": "2.0.0",
+    "@codingame/monaco-vscode-base-service-override": "2.0.0"
   }
 }

package/services.js

@@ -59,7 +59,6 @@ import './vscode/src/vs/editor/common/standaloneStrings.js';
 import './vscode/src/vs/base/browser/ui/codicons/codicon/codicon.css.js';
 import './vscode/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css.js';
 import './vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js';
-import './vscode/src/vs/editor/editor.api.js';
 export { default as Severity } from './vscode/src/vs/base/common/severity.js';
 export { IStorageService, StorageScope, StorageTarget } from './vscode/src/vs/platform/storage/common/storage.js';
 import { StandaloneServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';

package/editor.api.d.ts

@@ -1,8 +0,0 @@
-import { createModelReference, writeFile } from './monaco.js';
-export * from './vscode/src/vs/editor/editor.api.js';
-
-declare module './vscode/src/vs/editor/editor.api.js' {
-    export namespace editor {
-        export { createModelReference, writeFile };
-    }
-}

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/colors.js

@@ -1,7 +0,0 @@
-import { localizeWithPath } from '../../../../nls.js';
-import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
-registerColor('multiDiffEditor.headerBackground', { dark: '#808080', light: '#b4b4b4', hcDark: '#808080', hcLight: '#b4b4b4', }, ( localizeWithPath(
- 'vs/editor/browser/widget/multiDiffEditorWidget/colors',
- 'multiDiffEditor.headerBackground',
- 'The background color of the diff editor\'s header'
-)));

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/diffEditorItemTemplate.js

@@ -1,199 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h } from '../../../../base/browser/dom.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { observableValue, globalTransaction } from '../../../../base/common/observableInternal/base.js';
-import { DiffEditorWidget } from '../diffEditor/diffEditorWidget.js';
-import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ActionRunnerWithContext } from './utils.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';
-class TemplateData {
-    constructor(viewModel) {
-        this.viewModel = viewModel;
-    }
-    getId() {
-        return this.viewModel;
-    }
-}
-let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
-    constructor(_container, _overflowWidgetsDomNode, _workbenchUIElementFactory, _instantiationService) {
-        super();
-        this._container = _container;
-        this._overflowWidgetsDomNode = _overflowWidgetsDomNode;
-        this._workbenchUIElementFactory = _workbenchUIElementFactory;
-        this._instantiationService = _instantiationService;
-        this._viewModel = observableValue(this, undefined);
-        this._collapsed = derived(this, reader => this._viewModel.read(reader)?.collapsed.read(reader));
-        this._contentHeight = observableValue(this, 500);
-        this.height = derived(this, reader => {
-            const h = this._collapsed.read(reader) ? 0 : this._contentHeight.read(reader);
-            return h + this._outerEditorHeight;
-        });
-        this._modifiedContentWidth = observableValue(this, 0);
-        this._modifiedWidth = observableValue(this, 0);
-        this._originalContentWidth = observableValue(this, 0);
-        this._originalWidth = observableValue(this, 0);
-        this.maxScroll = derived(this, reader => {
-            const scroll1 = this._modifiedContentWidth.read(reader) - this._modifiedWidth.read(reader);
-            const scroll2 = this._originalContentWidth.read(reader) - this._originalWidth.read(reader);
-            if (scroll1 > scroll2) {
-                return { maxScroll: scroll1, width: this._modifiedWidth.read(reader) };
-            }
-            else {
-                return { maxScroll: scroll2, width: this._originalWidth.read(reader) };
-            }
-        });
-        this._elements = h('div.multiDiffEntry', [
-            h('div.content', {
-                style: {
-                    display: 'flex',
-                    flexDirection: 'column',
-                    flex: '1',
-                    overflow: 'hidden',
-                }
-            }, [
-                h('div.header@header', [
-                    h('div.collapse-button@collapseButton'),
-                    h('div.title.show-file-icons@title', []),
-                    h('div.actions@actions'),
-                ]),
-                h('div.editorParent', {
-                    style: {
-                        flex: '1',
-                        display: 'flex',
-                        flexDirection: 'column',
-                    }
-                }, [
-                    h('div.editorContainer@editor', { style: { flex: '1' } }),
-                ])
-            ])
-        ]);
-        this.editor = this._register(this._instantiationService.createInstance(DiffEditorWidget, this._elements.editor, {
-            overflowWidgetsDomNode: this._overflowWidgetsDomNode,
-        }, {}));
-        this.isModifedFocused = isFocused(this.editor.getModifiedEditor());
-        this.isOriginalFocused = isFocused(this.editor.getOriginalEditor());
-        this.isFocused = derived(this, reader => this.isModifedFocused.read(reader) || this.isOriginalFocused.read(reader));
-        this._resourceLabel = this._workbenchUIElementFactory.createResourceLabel
-            ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.title))
-            : undefined;
-        this._dataStore = ( new DisposableStore());
-        this._headerHeight = this._elements.header.clientHeight;
-        const btn = ( new Button(this._elements.collapseButton, {}));
-        this._register(autorun(reader => {
-            btn.element.className = '';
-            btn.icon = this._collapsed.read(reader) ? Codicon.chevronRight : Codicon.chevronDown;
-        }));
-        this._register(btn.onDidClick(() => {
-            this._viewModel.get()?.collapsed.set(!this._collapsed.get(), undefined);
-        }));
-        this._register(autorun(reader => {
-            this._elements.editor.style.display = this._collapsed.read(reader) ? 'none' : 'block';
-        }));
-        this.editor.getModifiedEditor().onDidLayoutChange(e => {
-            const width = this.editor.getModifiedEditor().getLayoutInfo().contentWidth;
-            this._modifiedWidth.set(width, undefined);
-        });
-        this.editor.getOriginalEditor().onDidLayoutChange(e => {
-            const width = this.editor.getOriginalEditor().getLayoutInfo().contentWidth;
-            this._originalWidth.set(width, undefined);
-        });
-        this._register(this.editor.onDidContentSizeChange(e => {
-            globalTransaction(tx => {
-                this._contentHeight.set(e.contentHeight, tx);
-                this._modifiedContentWidth.set(this.editor.getModifiedEditor().getContentWidth(), tx);
-                this._originalContentWidth.set(this.editor.getOriginalEditor().getContentWidth(), tx);
-            });
-        }));
-        this._register(autorun(reader => {
-            const isFocused = this.isFocused.read(reader);
-            this._elements.root.classList.toggle('focused', isFocused);
-        }));
-        this._container.appendChild(this._elements.root);
-        this._outerEditorHeight = 38;
-        this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
-            actionRunner: this._register(( new ActionRunnerWithContext(() => (this._viewModel.get()?.diffEditorViewModel?.model.modified.uri)))),
-            menuOptions: {
-                shouldForwardArgs: true,
-            }
-        }));
-    }
-    setScrollLeft(left) {
-        if (this._modifiedContentWidth.get() - this._modifiedWidth.get() > this._originalContentWidth.get() - this._originalWidth.get()) {
-            this.editor.getModifiedEditor().setScrollLeft(left);
-        }
-        else {
-            this.editor.getOriginalEditor().setScrollLeft(left);
-        }
-    }
-    setData(data) {
-        function updateOptions(options) {
-            return {
-                ...options,
-                scrollBeyondLastLine: false,
-                hideUnchangedRegions: {
-                    enabled: true,
-                },
-                scrollbar: {
-                    vertical: 'hidden',
-                    horizontal: 'hidden',
-                    handleMouseWheel: false,
-                    useShadows: false,
-                },
-                renderOverviewRuler: false,
-                fixedOverflowWidgets: true,
-            };
-        }
-        const value = data.viewModel.entry.value;
-        if (value.onOptionsDidChange) {
-            this._dataStore.add(value.onOptionsDidChange(() => {
-                this.editor.updateOptions(updateOptions(value.options ?? {}));
-            }));
-        }
-        globalTransaction(tx => {
-            this._resourceLabel?.setUri(data.viewModel.diffEditorViewModel.model.modified.uri);
-            this._dataStore.clear();
-            this._viewModel.set(data.viewModel, tx);
-            this.editor.setModel(data.viewModel.diffEditorViewModel, tx);
-            this.editor.updateOptions(updateOptions(value.options ?? {}));
-        });
-    }
-    render(verticalRange, width, editorScroll, viewPort) {
-        this._elements.root.style.visibility = 'visible';
-        this._elements.root.style.top = `${verticalRange.start}px`;
-        this._elements.root.style.height = `${verticalRange.length}px`;
-        this._elements.root.style.width = `${width}px`;
-        this._elements.root.style.position = 'absolute';
-        const delta = Math.max(0, Math.min(verticalRange.length - this._headerHeight, viewPort.start - verticalRange.start));
-        this._elements.header.style.transform = `translateY(${delta}px)`;
-        globalTransaction(tx => {
-            this.editor.layout({
-                width: width,
-                height: verticalRange.length - this._outerEditorHeight,
-            });
-        });
-        this.editor.getOriginalEditor().setScrollTop(editorScroll);
-        this._elements.header.classList.toggle('shadow', delta > 0 || editorScroll > 0);
-    }
-    hide() {
-        this._elements.root.style.top = `-100000px`;
-        this._elements.root.style.visibility = 'hidden';
-    }
-};
-DiffEditorItemTemplate = ( __decorate([
-    ( __param(3, IInstantiationService))
-], DiffEditorItemTemplate));
-function isFocused(editor) {
-    return observableFromEvent(h => {
-        const store = ( new DisposableStore());
-        store.add(editor.onDidFocusEditorWidget(() => h(true)));
-        store.add(editor.onDidBlurEditorWidget(() => h(false)));
-        return store;
-    }, () => editor.hasWidgetFocus());
-}
-export { DiffEditorItemTemplate, TemplateData };

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorViewModel.js

@@ -1,62 +0,0 @@
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { DiffEditorOptions } from '../diffEditor/diffEditorOptions.js';
-import { DiffEditorViewModel } from '../diffEditor/diffEditorViewModel.js';
-import { transaction, observableValue } from '../../../../base/common/observableInternal/base.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derivedWithStore } from '../../../../base/common/observableInternal/derived.js';
-class MultiDiffEditorViewModel extends Disposable {
-    async waitForDiffs() {
-        for (const d of this.items.get()) {
-            await d.diffEditorViewModel.waitForDiff();
-        }
-    }
-    collapseAll() {
-        transaction(tx => {
-            for (const d of this.items.get()) {
-                d.collapsed.set(true, tx);
-            }
-        });
-    }
-    expandAll() {
-        transaction(tx => {
-            for (const d of this.items.get()) {
-                d.collapsed.set(false, tx);
-            }
-        });
-    }
-    constructor(_model, _instantiationService) {
-        super();
-        this._model = _model;
-        this._instantiationService = _instantiationService;
-        this._documents = observableFromEvent(this._model.onDidChange,  () => this._model.documents);
-        this.items = derivedWithStore(this, (reader, store) => ( this._documents.read(reader).map(d => store.add(( new DocumentDiffItemViewModel(d, this._instantiationService)))))).recomputeInitiallyAndOnChange(this._store);
-        this.activeDiffItem = observableValue(this, undefined);
-    }
-}
-class DocumentDiffItemViewModel extends Disposable {
-    constructor(entry, _instantiationService) {
-        super();
-        this.entry = entry;
-        this._instantiationService = _instantiationService;
-        this.collapsed = observableValue(this, false);
-        function updateOptions(options) {
-            return {
-                ...options,
-                hideUnchangedRegions: {
-                    enabled: true,
-                },
-            };
-        }
-        const options = ( new DiffEditorOptions(updateOptions(this.entry.value.options || {})));
-        if (this.entry.value.onOptionsDidChange) {
-            this._register(this.entry.value.onOptionsDidChange(() => {
-                options.updateOptions(updateOptions(this.entry.value.options || {}));
-            }));
-        }
-        this.diffEditorViewModel = this._register(this._instantiationService.createInstance(DiffEditorViewModel, {
-            original: entry.value.original,
-            modified: entry.value.modified,
-        }, options));
-    }
-}
-export { DocumentDiffItemViewModel, MultiDiffEditorViewModel };

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget.js

@@ -1,59 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { readHotReloadableExport } from '../diffEditor/utils.js';
-import { MultiDiffEditorWidgetImpl } from './multiDiffEditorWidgetImpl.js';
-import { MultiDiffEditorViewModel } from './multiDiffEditorViewModel.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import './colors.js';
-import { DiffEditorItemTemplate } from './diffEditorItemTemplate.js';
-import { Event } from '../../../../base/common/event.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
-import { recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils.js';
-let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
-    constructor(_element, _workbenchUIElementFactory, _instantiationService) {
-        super();
-        this._element = _element;
-        this._workbenchUIElementFactory = _workbenchUIElementFactory;
-        this._instantiationService = _instantiationService;
-        this._dimension = observableValue(this, undefined);
-        this._viewModel = observableValue(this, undefined);
-        this._widgetImpl = derivedWithStore(this, (reader, store) => {
-            readHotReloadableExport(DiffEditorItemTemplate, reader);
-            return store.add(this._instantiationService.createInstance((readHotReloadableExport(MultiDiffEditorWidgetImpl, reader)), this._element, this._dimension, this._viewModel, this._workbenchUIElementFactory));
-        });
-        this._activeControl = derived(this, (reader) => this._widgetImpl.read(reader).activeControl.read(reader));
-        this.onDidChangeActiveControl = Event.fromObservableLight(this._activeControl);
-        this._scrollState = derived(this, (reader) => {
-            const w = this._widgetImpl.read(reader);
-            const top = w.scrollTop.read(reader);
-            const left = w.scrollLeft.read(reader);
-            return { top, left };
-        });
-        this.onDidChangeScrollState = Event.fromObservableLight(this._scrollState);
-        this._register(recomputeInitiallyAndOnChange(this._widgetImpl));
-    }
-    createViewModel(model) {
-        return ( new MultiDiffEditorViewModel(model, this._instantiationService));
-    }
-    setViewModel(viewModel) {
-        this._viewModel.set(viewModel, undefined);
-    }
-    layout(dimension) {
-        this._dimension.set(dimension, undefined);
-    }
-    getActiveControl() {
-        return this._activeControl.get();
-    }
-    getScrollState() {
-        return this._scrollState.get();
-    }
-    setScrollState(scrollState) {
-        const w = this._widgetImpl.get();
-        w.setScrollState(scrollState);
-    }
-};
-MultiDiffEditorWidget = ( __decorate([
-    ( __param(2, IInstantiationService))
-], MultiDiffEditorWidget));
-export { MultiDiffEditorWidget };

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidgetImpl.js

@@ -1,225 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, scheduleAtNextAnimationFrame, getWindow } from '../../../../base/browser/dom.js';
-import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { findFirstMaxBy } from '../../../../base/common/arraysFind.js';
-import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { transaction, globalTransaction, observableValue, disposableObservableValue } from '../../../../base/common/observableInternal/base.js';
-import { Scrollable } from '../../../../base/common/scrollable.js';
-import './style.css.js';
-import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
-import { OffsetRange } from '../../../common/core/offsetRange.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
-import { ObjectPool } from './objectPool.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { observableFromEvent, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
-import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposable {
-    constructor(_element, _dimension, _viewModel, _workbenchUIElementFactory, _parentContextKeyService, _parentInstantiationService) {
-        super();
-        this._element = _element;
-        this._dimension = _dimension;
-        this._viewModel = _viewModel;
-        this._workbenchUIElementFactory = _workbenchUIElementFactory;
-        this._parentContextKeyService = _parentContextKeyService;
-        this._parentInstantiationService = _parentInstantiationService;
-        this._elements = h('div', {
-            style: {
-                overflowY: 'hidden',
-            }
-        }, [
-            h('div@content', {
-                style: {
-                    overflow: 'hidden',
-                }
-            }),
-            h('div.monaco-editor@overflowWidgetsDomNode', {}),
-        ]);
-        this._sizeObserver = this._register(( new ObservableElementSizeObserver(this._element, undefined)));
-        this._objectPool = this._register(( new ObjectPool((data) => {
-            const template = this._instantiationService.createInstance(DiffEditorItemTemplate, this._elements.content, this._elements.overflowWidgetsDomNode, this._workbenchUIElementFactory);
-            template.setData(data);
-            return template;
-        })));
-        this._scrollable = this._register(( new Scrollable({
-            forceIntegerValues: false,
-            scheduleAtNextAnimationFrame: (cb) => scheduleAtNextAnimationFrame(getWindow(this._element), cb),
-            smoothScrollDuration: 100,
-        })));
-        this._scrollableElement = this._register(( new SmoothScrollableElement(this._elements.root, {
-            vertical: 1 ,
-            horizontal: 1 ,
-            className: 'monaco-component',
-            useShadows: false,
-        }, this._scrollable)));
-        this.scrollTop = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
-        this.scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
-        this._viewItems = derivedWithStore(this, (reader, store) => {
-            const vm = this._viewModel.read(reader);
-            if (!vm) {
-                return [];
-            }
-            const items = vm.items.read(reader);
-            return ( items.map(d => store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft)))));
-        });
-        this._totalHeight = ( this._viewItems.map(
-            this,
-            (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader), 0)
-        ));
-        this.activeDiffItem = derived(this, reader => this._viewItems.read(reader).find(i => i.template.read(reader)?.isFocused.read(reader)));
-        this.lastActiveDiffItem = derivedObservableWithCache((reader, lastValue) => this.activeDiffItem.read(reader) ?? lastValue);
-        this.activeControl = derived(this, reader => this.lastActiveDiffItem.read(reader)?.template.read(reader)?.editor);
-        this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._element));
-        this._instantiationService = this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
-        this._contextKeyService.createKey(EditorContextKeys.inMultiDiffEditor.key, true);
-        const ctxAllCollapsed = this._parentContextKeyService.createKey(EditorContextKeys.multiDiffEditorAllCollapsed.key, false);
-        this._register(autorun((reader) => {
-            const viewModel = this._viewModel.read(reader);
-            if (viewModel) {
-                const allCollapsed = viewModel.items.read(reader).every(item => item.collapsed.read(reader));
-                ctxAllCollapsed.set(allCollapsed);
-            }
-        }));
-        this._register(autorun((reader) => {
-            const lastActiveDiffItem = this.lastActiveDiffItem.read(reader);
-            transaction(tx => {
-                this._viewModel.read(reader)?.activeDiffItem.set(lastActiveDiffItem?.viewModel, tx);
-            });
-        }));
-        this._register(autorun((reader) => {
-            const dimension = this._dimension.read(reader);
-            this._sizeObserver.observe(dimension);
-        }));
-        this._elements.content.style.position = 'relative';
-        this._register(autorun((reader) => {
-            const height = this._sizeObserver.height.read(reader);
-            this._elements.root.style.height = `${height}px`;
-            const totalHeight = this._totalHeight.read(reader);
-            this._elements.content.style.height = `${totalHeight}px`;
-            const width = this._sizeObserver.width.read(reader);
-            let scrollWidth = width;
-            const viewItems = this._viewItems.read(reader);
-            const max = findFirstMaxBy(viewItems, i => i.maxScroll.read(reader).maxScroll);
-            if (max) {
-                const maxScroll = max.maxScroll.read(reader);
-                scrollWidth = width + maxScroll.maxScroll;
-            }
-            this._scrollableElement.setScrollDimensions({
-                width: width,
-                height: height,
-                scrollHeight: totalHeight,
-                scrollWidth,
-            });
-        }));
-        _element.replaceChildren(this._scrollableElement.getDomNode());
-        this._register(toDisposable(() => {
-            _element.replaceChildren();
-        }));
-        this._register(this._register(autorun(reader => {
-            globalTransaction(tx => {
-                this.render(reader);
-            });
-        })));
-    }
-    setScrollState(scrollState) {
-        this._scrollableElement.setScrollPosition({ scrollLeft: scrollState.left, scrollTop: scrollState.top });
-    }
-    render(reader) {
-        const scrollTop = this.scrollTop.read(reader);
-        let contentScrollOffsetToScrollOffset = 0;
-        let itemHeightSumBefore = 0;
-        let itemContentHeightSumBefore = 0;
-        const viewPortHeight = this._sizeObserver.height.read(reader);
-        const contentViewPort = OffsetRange.ofStartAndLength(scrollTop, viewPortHeight);
-        const width = this._sizeObserver.width.read(reader);
-        for (const v of this._viewItems.read(reader)) {
-            const itemContentHeight = v.contentHeight.read(reader);
-            const itemHeight = Math.min(itemContentHeight, viewPortHeight);
-            const itemRange = OffsetRange.ofStartAndLength(itemHeightSumBefore, itemHeight);
-            const itemContentRange = OffsetRange.ofStartAndLength(itemContentHeightSumBefore, itemContentHeight);
-            if (itemContentRange.isBefore(contentViewPort)) {
-                contentScrollOffsetToScrollOffset -= itemContentHeight - itemHeight;
-                v.hide();
-            }
-            else if (itemContentRange.isAfter(contentViewPort)) {
-                v.hide();
-            }
-            else {
-                const scroll = Math.max(0, Math.min(contentViewPort.start - itemContentRange.start, itemContentHeight - itemHeight));
-                contentScrollOffsetToScrollOffset -= scroll;
-                const viewPort = OffsetRange.ofStartAndLength(scrollTop + contentScrollOffsetToScrollOffset, viewPortHeight);
-                v.render(itemRange, scroll, width, viewPort);
-            }
-            itemHeightSumBefore += itemHeight;
-            itemContentHeightSumBefore += itemContentHeight;
-        }
-        this._elements.content.style.transform = `translateY(${-(scrollTop + contentScrollOffsetToScrollOffset)}px)`;
-    }
-};
-MultiDiffEditorWidgetImpl = ( __decorate([
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IInstantiationService))
-], MultiDiffEditorWidgetImpl));
-class VirtualizedViewItem extends Disposable {
-    constructor(viewModel, _objectPool, _scrollLeft) {
-        super();
-        this.viewModel = viewModel;
-        this._objectPool = _objectPool;
-        this._scrollLeft = _scrollLeft;
-        this._lastTemplateData = observableValue(this, { contentHeight: 500, maxScroll: { maxScroll: 0, width: 0 }, });
-        this._templateRef = this._register(disposableObservableValue(this, undefined));
-        this.contentHeight = derived(this, reader => this._templateRef.read(reader)?.object.height?.read(reader) ?? this._lastTemplateData.read(reader).contentHeight);
-        this.maxScroll = derived(this, reader => this._templateRef.read(reader)?.object.maxScroll.read(reader) ?? this._lastTemplateData.read(reader).maxScroll);
-        this.template = derived(this, reader => this._templateRef.read(reader)?.object);
-        this._isHidden = observableValue(this, false);
-        this._register(autorun((reader) => {
-            const scrollLeft = this._scrollLeft.read(reader);
-            this._templateRef.read(reader)?.object.setScrollLeft(scrollLeft);
-        }));
-        this._register(autorun(reader => {
-            const ref = this._templateRef.read(reader);
-            if (!ref) {
-                return;
-            }
-            const isHidden = this._isHidden.read(reader);
-            if (!isHidden) {
-                return;
-            }
-            const isFocused = ref.object.isFocused.read(reader);
-            if (isFocused) {
-                return;
-            }
-            transaction(tx => {
-                this._lastTemplateData.set({
-                    contentHeight: ref.object.height.get(),
-                    maxScroll: { maxScroll: 0, width: 0, }
-                }, tx);
-                ref.object.hide();
-                this._templateRef.set(undefined, tx);
-            });
-        }));
-    }
-    dispose() {
-        this.hide();
-        super.dispose();
-    }
-    toString() {
-        return `VirtualViewItem(${this.viewModel.entry.value.title})`;
-    }
-    hide() {
-        this._isHidden.set(true, undefined);
-    }
-    render(verticalSpace, offset, width, viewPort) {
-        this._isHidden.set(false, undefined);
-        let ref = this._templateRef.get();
-        if (!ref) {
-            ref = this._objectPool.getUnusedObj(( new TemplateData(this.viewModel)));
-            this._templateRef.set(ref, undefined);
-        }
-        ref.object.render(verticalSpace, width, offset, viewPort);
-    }
-}
-export { MultiDiffEditorWidgetImpl };

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/objectPool.js

@@ -1,46 +0,0 @@
-class ObjectPool {
-    constructor(_create) {
-        this._create = _create;
-        this._unused = ( new Set());
-        this._used = ( new Set());
-        this._itemData = ( new Map());
-    }
-    getUnusedObj(data) {
-        let obj;
-        if (this._unused.size === 0) {
-            obj = this._create(data);
-            this._itemData.set(obj, data);
-        }
-        else {
-            const values = [...( this._unused.values())];
-            obj = values.find(obj => this._itemData.get(obj).getId() === data.getId()) ?? values[0];
-            this._unused.delete(obj);
-            this._itemData.set(obj, data);
-            obj.setData(data);
-        }
-        this._used.add(obj);
-        return {
-            object: obj,
-            dispose: () => {
-                this._used.delete(obj);
-                if (this._unused.size > 5) {
-                    obj.dispose();
-                }
-                else {
-                    this._unused.add(obj);
-                }
-            }
-        };
-    }
-    dispose() {
-        for (const obj of this._used) {
-            obj.dispose();
-        }
-        for (const obj of this._unused) {
-            obj.dispose();
-        }
-        this._used.clear();
-        this._unused.clear();
-    }
-}
-export { ObjectPool };

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/style.css.js

@@ -1,4 +0,0 @@
-import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-component .multiDiffEntry{display:flex;flex-direction:column}.monaco-component .multiDiffEntry .editorParent{border-left:2px solid var(--vscode-tab-inactiveBackground)}.monaco-component .multiDiffEntry.focused .editorParent{border-left:2px solid var(--vscode-notebook-focusedCellBorder)}.monaco-component .multiDiffEntry .editorParent .editorContainer{border-left:17px solid var(--vscode-tab-inactiveBackground)}.monaco-component .multiDiffEntry .collapse-button{cursor:pointer;margin:0 5px}.monaco-component .multiDiffEntry .collapse-button a{display:block}.monaco-component .multiDiffEntry .header{align-items:center;background:var(--vscode-editor-background);border-bottom:1px solid var(--vscode-sideBarSectionHeader-border);border-left:2px solid var(--vscode-editor-background);border-top:1px solid var(--vscode-sideBarSectionHeader-border);color:var(--vscode-foreground);display:flex;padding:8px 5px;z-index:1000}.monaco-component .multiDiffEntry.focused .header{border-left:2px solid var(--vscode-notebook-focusedCellBorder)}.monaco-component .multiDiffEntry .header.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.monaco-component .multiDiffEntry .header .title{flex:1;font-size:14px;line-height:22px}.monaco-component .multiDiffEntry .header .actions{padding:0 8px}";
-n(css,{});
-export { css, css as default };