@codingame/monaco-vscode-editor-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/esm/vs/editor/editor.api.js

@@ -18,7 +18,7 @@ import { PLAINTEXT_LANGUAGE_ID, ModesRegistry } from 'vscode/vscode/vs/editor/co
 import { nullTokenize, nullTokenizeEncoded, NullState } from 'vscode/vscode/vs/editor/common/languages/nullTokenize';
 import { TextModelResolvedOptions, FindMatch } from 'vscode/vscode/vs/editor/common/model';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { AccessibilitySupport, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, MinimapPosition, MouseTargetType, OverlayWidgetPositionPreference, OverviewRulerLane, GlyphMarginLane, RenderLineNumbersType, RenderMinimap, ScrollbarVisibility, ScrollType, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent, InjectedTextCursorStops, PositionAffinity, ShowAiIconMode, DocumentHighlightKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule, SymbolKind, SymbolTag, IndentAction, CompletionTriggerKind, SignatureHelpTriggerKind, InlayHintKind, InlineCompletionTriggerKind, CodeActionTriggerType } from 'vscode/vscode/vs/editor/common/standalone/standaloneEnums';
+import { AccessibilitySupport, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, MinimapPosition, MouseTargetType, OverlayWidgetPositionPreference, OverviewRulerLane, GlyphMarginLane, RenderLineNumbersType, RenderMinimap, ScrollbarVisibility, ScrollType, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent, InjectedTextCursorStops, PositionAffinity, ShowLightbulbIconMode, DocumentHighlightKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule, SymbolKind, SymbolTag, IndentAction, CompletionTriggerKind, SignatureHelpTriggerKind, InlayHintKind, InlineCompletionTriggerKind, CodeActionTriggerType } from 'vscode/vscode/vs/editor/common/standalone/standaloneEnums';
 import { createTrustedTypesPolicy } from 'vscode/vscode/vs/base/browser/trustedTypes';
 import { LineTokens } from 'vscode/vscode/vs/editor/common/tokens/lineTokens';
 import { renderViewLine2, RenderLineInput } from 'vscode/vscode/vs/editor/common/viewLayout/viewLineRenderer';
@@ -47,10 +47,11 @@ import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEdi
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { ActionRunner } from 'vscode/vscode/vs/base/common/actions';
 import { derived, derivedWithStore } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromEvent, derivedObservableWithCache, recomputeInitiallyAndOnChange } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { autorun, autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { observableFromEvent, derivedObservableWithCache, mapObservableArrayCached, recomputeInitiallyAndOnChange } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
+import { Selection as Selection$1 } from 'vscode/vscode/vs/editor/common/core/selection';
 import { DiffEditorOptions } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorOptions';
 import { DiffEditorViewModel } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorViewModel';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -64,7 +65,7 @@ import { createConfiguredEditor, createConfiguredDiffEditor, createModelReferenc
 
 var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=( Object.keys(r.attributes)),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
 
-var css$1 = ".monaco-editor{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Consolas,\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace;font-family:-apple-system,BlinkMacSystemFont,Segoe WPC,Segoe UI,HelveticaNeue-Light,system-ui,Ubuntu,Droid Sans,sans-serif}.monaco-editor.hc-black .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.hc-light .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item:focus .action-label{stroke-width:1.2px}.monaco-hover p{margin:0}.monaco-aria-container{clip:rect(1px,1px,1px,1px);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute!important;top:0;width:1px}";
+var css$1 = ".monaco-editor{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Consolas,\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace;font-family:-apple-system,BlinkMacSystemFont,Segoe WPC,Segoe UI,HelveticaNeue-Light,system-ui,Ubuntu,Droid Sans,sans-serif}.monaco-editor.hc-black .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.hc-light .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-editor.vs-dark .monaco-menu .monaco-action-bar.vertical .action-menu-item:focus .action-label,.monaco-menu .monaco-action-bar.vertical .action-item .action-menu-item:focus .action-label{stroke-width:1.2px}.monaco-hover p{margin:0}.monaco-aria-container{clip:rect(1px,1px,1px,1px);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute!important;top:0;width:1px}.monaco-diff-editor .synthetic-focus,.monaco-diff-editor [tabindex=\"-1\"]:focus,.monaco-diff-editor [tabindex=\"0\"]:focus,.monaco-diff-editor button:focus,.monaco-diff-editor input[type=button]:focus,.monaco-diff-editor input[type=checkbox]:focus,.monaco-diff-editor input[type=search]:focus,.monaco-diff-editor input[type=text]:focus,.monaco-diff-editor select:focus,.monaco-diff-editor textarea:focus,.monaco-editor{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}";
 n(css$1,{});
 
 function __decorate(decorators, target, key, desc) {
@@ -1029,7 +1030,7 @@ function _actualColorize(lines, tabSize, tokenizationSupport, languageIdCodec) {
     return html.join('');
 }
 
-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}";
+var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden}.monaco-component .multiDiffEntry{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.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-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;padding:8px 5px;z-index:1000}.monaco-component .multiDiffEntry .header.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.monaco-component .multiDiffEntry .header .file-path{display:flex;flex:1;min-width:0}.monaco-component .multiDiffEntry .header .file-path .title{font-size:14px;line-height:22px}.monaco-component .multiDiffEntry .header .file-path .status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}.monaco-component .multiDiffEntry .header .file-path .title.original{flex:1;min-width:0;text-overflow:ellipsis}.monaco-component .multiDiffEntry .header .actions{padding:0 8px}.monaco-component .multiDiffEntry .editorParent{display:flex;flex:1;flex-direction:column}.monaco-component .multiDiffEntry .editorContainer{flex:1}";
 n(css,{});
 
 class ActionRunnerWithContext extends ActionRunner {
@@ -1059,9 +1060,9 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         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);
+        this._editorContentHeight = observableValue(this, 500);
+        this.contentHeight = derived(this, reader => {
+            const h = this._collapsed.read(reader) ? 0 : this._editorContentHeight.read(reader);
             return h + this._outerEditorHeight;
         });
         this._modifiedContentWidth = observableValue(this, 0);
@@ -1079,28 +1080,17 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
             }
         });
         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.header@header', [
+                h('div.collapse-button@collapseButton'),
+                h('div.file-path', [
+                    h('div.title.modified.show-file-icons@primaryPath', []),
+                    h('div.status.deleted@status', ['R']),
+                    h('div.title.original.show-file-icons@secondaryPath', []),
                 ]),
-                h('div.editorParent', {
-                    style: {
-                        flex: '1',
-                        display: 'flex',
-                        flexDirection: 'column',
-                    }
-                }, [
-                    h('div.editorContainer@editor', { style: { flex: '1' } }),
-                ])
+                h('div.actions@actions'),
+            ]),
+            h('div.editorParent', [
+                h('div.editorContainer@editor'),
             ])
         ]);
         this.editor = this._register(this._instantiationService.createInstance(DiffEditorWidget, this._elements.editor, {
@@ -1110,10 +1100,13 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         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))
+            ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.primaryPath))
+            : undefined;
+        this._resourceLabel2 = this._workbenchUIElementFactory.createResourceLabel
+            ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.secondaryPath))
             : undefined;
         this._dataStore = ( new DisposableStore());
-        this._headerHeight = this._elements.header.clientHeight;
+        this._headerHeight = 38;
         const btn = ( new Button(this._elements.collapseButton, {}));
         this._register(autorun(reader => {
             btn.element.className = '';
@@ -1135,7 +1128,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         });
         this._register(this.editor.onDidContentSizeChange(e => {
             globalTransaction(tx => {
-                this._contentHeight.set(e.contentHeight, tx);
+                this._editorContentHeight.set(e.contentHeight, tx);
                 this._modifiedContentWidth.set(this.editor.getModifiedEditor().getContentWidth(), tx);
                 this._originalContentWidth.set(this.editor.getOriginalEditor().getContentWidth(), tx);
             });
@@ -1147,10 +1140,11 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         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)))),
+            actionRunner: this._register(( new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri)))),
             menuOptions: {
                 shouldForwardArgs: true,
-            }
+            },
+            toolbarOptions: { primaryGroup: g => g.startsWith('navigation') },
         }));
     }
     setScrollLeft(left) {
@@ -1177,6 +1171,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
                 },
                 renderOverviewRuler: false,
                 fixedOverflowWidgets: true,
+                overviewRulerBorder: false,
             };
         }
         const value = data.viewModel.entry.value;
@@ -1186,7 +1181,28 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
             }));
         }
         globalTransaction(tx => {
-            this._resourceLabel?.setUri(data.viewModel.diffEditorViewModel.model.modified.uri);
+            this._resourceLabel?.setUri(data.viewModel.modifiedUri ?? data.viewModel.originalUri, { strikethrough: data.viewModel.modifiedUri === undefined });
+            let isRenamed = false;
+            let isDeleted = false;
+            let isAdded = false;
+            let flag = '';
+            if (data.viewModel.modifiedUri && data.viewModel.originalUri && data.viewModel.modifiedUri.path !== data.viewModel.originalUri.path) {
+                flag = 'R';
+                isRenamed = true;
+            }
+            else if (!data.viewModel.modifiedUri) {
+                flag = 'D';
+                isDeleted = true;
+            }
+            else if (!data.viewModel.originalUri) {
+                flag = 'A';
+                isAdded = true;
+            }
+            this._elements.status.classList.toggle('renamed', isRenamed);
+            this._elements.status.classList.toggle('deleted', isDeleted);
+            this._elements.status.classList.toggle('added', isAdded);
+            this._elements.status.innerText = flag;
+            this._resourceLabel2?.setUri(isRenamed ? data.viewModel.originalUri : undefined, { strikethrough: true });
             this._dataStore.clear();
             this._viewModel.set(data.viewModel, tx);
             this.editor.setModel(data.viewModel.diffEditorViewModel, tx);
@@ -1282,11 +1298,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         this._workbenchUIElementFactory = _workbenchUIElementFactory;
         this._parentContextKeyService = _parentContextKeyService;
         this._parentInstantiationService = _parentInstantiationService;
-        this._elements = h('div', {
-            style: {
-                overflowY: 'hidden',
-            }
-        }, [
+        this._elements = h('div.monaco-component.multiDiffEditor', [
             h('div@content', {
                 style: {
                     overflow: 'hidden',
@@ -1308,7 +1320,6 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         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);
@@ -1319,18 +1330,39 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 return [];
             }
             const items = vm.items.read(reader);
-            return ( items.map(d => store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft)))));
+            return ( items.map(d => {
+                const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft)));
+                const data = this._lastDocStates?.[item.getKey()];
+                if (data) {
+                    transaction(tx => {
+                        item.setViewState(data, tx);
+                    });
+                }
+                return item;
+            }));
         });
+        this._spaceBetweenPx = 10;
         this._totalHeight = ( this._viewItems.map(
             this,
-            (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader), 0)
+            (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader) + this._spaceBetweenPx, 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._lastDocStates = {};
         this._contextKeyService.createKey(EditorContextKeys.inMultiDiffEditor.key, true);
+        this._register(autorunWithStore((reader, store) => {
+            const viewModel = this._viewModel.read(reader);
+            if (viewModel && viewModel.contextKeys) {
+                for (const [key, value] of Object.entries(viewModel.contextKeys)) {
+                    const contextKey = this._contextKeyService.createKey(key, undefined);
+                    contextKey.set(value);
+                    store.add(toDisposable(() => contextKey.reset()));
+                }
+            }
+        }));
         const ctxAllCollapsed = this._parentContextKeyService.createKey(EditorContextKeys.multiDiffEditorAllCollapsed.key, false);
         this._register(autorun((reader) => {
             const viewModel = this._viewModel.read(reader);
@@ -1383,6 +1415,43 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
     setScrollState(scrollState) {
         this._scrollableElement.setScrollPosition({ scrollLeft: scrollState.left, scrollTop: scrollState.top });
     }
+    getViewState() {
+        return {
+            scrollState: {
+                top: this.scrollTop.get(),
+                left: this.scrollLeft.get(),
+            },
+            docStates: Object.fromEntries(( this._viewItems.get().map(i => [i.getKey(), i.getViewState()]))),
+        };
+    }
+    setViewState(viewState) {
+        this.setScrollState(viewState.scrollState);
+        this._lastDocStates = viewState.docStates;
+        transaction(tx => {
+            if (viewState.docStates) {
+                for (const i of this._viewItems.get()) {
+                    const state = viewState.docStates[i.getKey()];
+                    if (state) {
+                        i.setViewState(state, tx);
+                    }
+                }
+            }
+        });
+    }
+    tryGetCodeEditor(resource) {
+        const item = this._viewItems.get().find(v => ( v.viewModel.diffEditorViewModel.model.modified.uri.toString()) === ( resource.toString())
+            || ( v.viewModel.diffEditorViewModel.model.original.uri.toString()) === ( resource.toString()));
+        const editor = item?.template.get()?.editor;
+        if (!editor) {
+            return undefined;
+        }
+        if (( item.viewModel.diffEditorViewModel.model.modified.uri.toString()) === ( resource.toString())) {
+            return { diffEditor: editor, editor: editor.getModifiedEditor() };
+        }
+        else {
+            return { diffEditor: editor, editor: editor.getOriginalEditor() };
+        }
+    }
     render(reader) {
         const scrollTop = this.scrollTop.read(reader);
         let contentScrollOffsetToScrollOffset = 0;
@@ -1409,8 +1478,8 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 const viewPort = OffsetRange.ofStartAndLength(scrollTop + contentScrollOffsetToScrollOffset, viewPortHeight);
                 v.render(itemRange, scroll, width, viewPort);
             }
-            itemHeightSumBefore += itemHeight;
-            itemContentHeightSumBefore += itemContentHeight;
+            itemHeightSumBefore += itemHeight + this._spaceBetweenPx;
+            itemContentHeightSumBefore += itemContentHeight + this._spaceBetweenPx;
         }
         this._elements.content.style.transform = `translateY(${-(scrollTop + contentScrollOffsetToScrollOffset)}px)`;
     }
@@ -1425,10 +1494,9 @@ class VirtualizedViewItem extends Disposable {
         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.contentHeight = derived(this, reader => this._templateRef.read(reader)?.object.contentHeight?.read(reader) ?? this.viewModel.lastTemplateData.read(reader).contentHeight);
+        this.maxScroll = derived(this, reader => this._templateRef.read(reader)?.object.maxScroll.read(reader) ?? { maxScroll: 0, scrollWidth: 0 });
         this.template = derived(this, reader => this._templateRef.read(reader)?.object);
         this._isHidden = observableValue(this, false);
         this._register(autorun((reader) => {
@@ -1448,22 +1516,64 @@ class VirtualizedViewItem extends Disposable {
             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);
-            });
+            this._clear();
         }));
     }
     dispose() {
-        this.hide();
+        this._clear();
         super.dispose();
     }
     toString() {
-        return `VirtualViewItem(${this.viewModel.entry.value.title})`;
+        return `VirtualViewItem(${this.viewModel.entry.value.modified?.uri.toString()})`;
+    }
+    getKey() {
+        return this.viewModel.getKey();
+    }
+    getViewState() {
+        transaction(tx => {
+            this._updateTemplateData(tx);
+        });
+        return {
+            collapsed: this.viewModel.collapsed.get(),
+            selections: this.viewModel.lastTemplateData.get().selections,
+        };
+    }
+    setViewState(viewState, tx) {
+        this.viewModel.collapsed.set(viewState.collapsed, tx);
+        this._updateTemplateData(tx);
+        const data = this.viewModel.lastTemplateData.get();
+        const selections = viewState.selections?.map(Selection$1.liftSelection);
+        this.viewModel.lastTemplateData.set({
+            ...data,
+            selections,
+        }, tx);
+        const ref = this._templateRef.get();
+        if (ref) {
+            if (selections) {
+                ref.object.editor.setSelections(selections);
+            }
+        }
+    }
+    _updateTemplateData(tx) {
+        const ref = this._templateRef.get();
+        if (!ref) {
+            return;
+        }
+        this.viewModel.lastTemplateData.set({
+            contentHeight: ref.object.contentHeight.get(),
+            selections: ref.object.editor.getSelections() ?? undefined,
+        }, tx);
+    }
+    _clear() {
+        const ref = this._templateRef.get();
+        if (!ref) {
+            return;
+        }
+        transaction(tx => {
+            this._updateTemplateData(tx);
+            ref.object.hide();
+            this._templateRef.set(undefined, tx);
+        });
     }
     hide() {
         this._isHidden.set(true, undefined);
@@ -1474,6 +1584,10 @@ class VirtualizedViewItem extends Disposable {
         if (!ref) {
             ref = this._objectPool.getUnusedObj(( new TemplateData(this.viewModel)));
             this._templateRef.set(ref, undefined);
+            const selections = this.viewModel.lastTemplateData.get().selections;
+            if (selections) {
+                ref.object.editor.setSelections(selections);
+            }
         }
         ref.object.render(verticalSpace, width, offset, viewPort);
     }
@@ -1499,21 +1613,29 @@ class MultiDiffEditorViewModel extends Disposable {
             }
         });
     }
-    constructor(_model, _instantiationService) {
+    get contextKeys() {
+        return this.model.contextKeys;
+    }
+    constructor(model, _instantiationService) {
         super();
-        this._model = _model;
+        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._documents = observableFromEvent(this.model.onDidChange,  () => this.model.documents);
+        this.items = mapObservableArrayCached(this, this._documents, (d, store) => store.add(this._instantiationService.createInstance(DocumentDiffItemViewModel, d)))
+            .recomputeInitiallyAndOnChange(this._store);
         this.activeDiffItem = observableValue(this, undefined);
     }
 }
-class DocumentDiffItemViewModel extends Disposable {
-    constructor(entry, _instantiationService) {
+let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposable {
+    get originalUri() { return this.entry.value.original?.uri; }
+    get modifiedUri() { return this.entry.value.modified?.uri; }
+    constructor(entry, _instantiationService, _modelService) {
         super();
         this.entry = entry;
         this._instantiationService = _instantiationService;
+        this._modelService = _modelService;
         this.collapsed = observableValue(this, false);
+        this.lastTemplateData = observableValue(this, { contentHeight: 500, selections: undefined, });
         function updateOptions(options) {
             return {
                 ...options,
@@ -1528,18 +1650,40 @@ class DocumentDiffItemViewModel extends Disposable {
                 options.updateOptions(updateOptions(this.entry.value.options || {}));
             }));
         }
+        const originalTextModel = this.entry.value.original ?? this._register(this._modelService.createModel('', null));
+        const modifiedTextModel = this.entry.value.modified ?? this._register(this._modelService.createModel('', null));
         this.diffEditorViewModel = this._register(this._instantiationService.createInstance(DiffEditorViewModel, {
-            original: entry.value.original,
-            modified: entry.value.modified,
+            original: originalTextModel,
+            modified: modifiedTextModel,
         }, options));
     }
-}
+    getKey() {
+        return JSON.stringify([
+            this.originalUri?.toString(),
+            this.modifiedUri?.toString()
+        ]);
+    }
+};
+DocumentDiffItemViewModel = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IModelService))
+], DocumentDiffItemViewModel));
 
 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'
 )));
+registerColor('multiDiffEditor.background', { dark: '#000000', light: '#e5e5e5', hcDark: '#000000', hcLight: '#e5e5e5', }, ( localizeWithPath(
+ 'vs/editor/browser/widget/multiDiffEditorWidget/colors',
+ 'multiDiffEditor.background',
+ 'The background color of the multi file diff editor'
+)));
+registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localizeWithPath(
+ 'vs/editor/browser/widget/multiDiffEditorWidget/colors',
+ 'multiDiffEditor.border',
+ 'The border color of the multi file diff editor'
+)));
 
 let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
     constructor(_element, _workbenchUIElementFactory, _instantiationService) {
@@ -1555,13 +1699,6 @@ let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
         });
         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) {
@@ -1576,12 +1713,14 @@ let MultiDiffEditorWidget = class MultiDiffEditorWidget extends Disposable {
     getActiveControl() {
         return this._activeControl.get();
     }
-    getScrollState() {
-        return this._scrollState.get();
+    getViewState() {
+        return this._widgetImpl.get().getViewState();
     }
-    setScrollState(scrollState) {
-        const w = this._widgetImpl.get();
-        w.setScrollState(scrollState);
+    setViewState(viewState) {
+        this._widgetImpl.get().setViewState(viewState);
+    }
+    tryGetCodeEditor(resource) {
+        return this._widgetImpl.get().tryGetCodeEditor(resource);
     }
 };
 MultiDiffEditorWidget = ( __decorate([
@@ -1884,7 +2023,7 @@ function createMonacoEditorAPI() {
         WrappingIndent: WrappingIndent,
         InjectedTextCursorStops: InjectedTextCursorStops,
         PositionAffinity: PositionAffinity,
-        ShowAiIconMode: ShowAiIconMode,
+        ShowLightbulbIconMode: ShowLightbulbIconMode,
         ConfigurationChangedEvent: ConfigurationChangedEvent,
         BareFontInfo: BareFontInfo,
         FontInfo: FontInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-editor-api",
-  "version": "2.0.3-improve-modularity.1",
+  "version": "2.1.0-update-vscode-1.86.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "esm/vs/editor/editor.api.js",
   "types": "esm/vs/editor/editor.api.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3-improve-modularity.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0-update-vscode-1.86.1"
   }
 }