@codingame/monaco-vscode-api 31.0.1 → 32.0.0

package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js

@@ -36,9 +36,9 @@ import { observableValue } from '../../../../../base/common/observableInternal/o
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(accessibleDiffViewer);
-const accessibleDiffViewerInsertIcon = registerIcon("diff-review-insert", Codicon.add, ( localize(179, "Icon for 'Insert' in accessible diff viewer.")));
-const accessibleDiffViewerRemoveIcon = registerIcon("diff-review-remove", Codicon.remove, ( localize(180, "Icon for 'Remove' in accessible diff viewer.")));
-const accessibleDiffViewerCloseIcon = registerIcon("diff-review-close", Codicon.close, ( localize(181, "Icon for 'Close' in accessible diff viewer.")));
+const accessibleDiffViewerInsertIcon = registerIcon("diff-review-insert", Codicon.add, ( localize(191, "Icon for 'Insert' in accessible diff viewer.")));
+const accessibleDiffViewerRemoveIcon = registerIcon("diff-review-remove", Codicon.remove, ( localize(192, "Icon for 'Remove' in accessible diff viewer.")));
+const accessibleDiffViewerCloseIcon = registerIcon("diff-review-close", Codicon.close, ( localize(193, "Icon for 'Close' in accessible diff viewer.")));
 let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
     static {
         this._ttPolicy = createTrustedTypesPolicy("diffReview", {
@@ -349,7 +349,7 @@ let View = class View extends Disposable {
             if (this._model.canClose.read(reader)) {
                 this._actionBar.push(toAction({
                     id: "diffreview.close",
-                    label: ( localize(182, "Close")),
+                    label: ( localize(194, "Close")),
                     class: "close-diff-review " + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon),
                     enabled: true,
                     run: async () => _model.close()
@@ -409,7 +409,7 @@ let View = class View extends Disposable {
         const container = createElement("div");
         container.className = "diff-review-table";
         container.setAttribute("role", "list");
-        container.setAttribute("aria-label", ( localize(183, "Accessible Diff Viewer. Use arrow up and down to navigate.")));
+        container.setAttribute("aria-label", ( localize(195, "Accessible Diff Viewer. Use arrow up and down to navigate.")));
         applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -433,11 +433,11 @@ let View = class View extends Disposable {
                 const r = group.range;
                 const diffIndex = this._model.currentGroupIndex.get();
                 const diffsLength = this._model.groups.get().length;
-                const getAriaLines = lines => lines === 0 ? ( localize(184, "no lines changed")) : lines === 1 ? ( localize(185, "1 line changed")) : ( localize(186, "{0} lines changed", lines));
+                const getAriaLines = lines => lines === 0 ? ( localize(196, "no lines changed")) : lines === 1 ? ( localize(197, "1 line changed")) : ( localize(198, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute("aria-label", ( localize(
-                    187,
+                    199,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -584,16 +584,16 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(188, "blank"));
+            lineContent = ( localize(200, "blank"));
         }
         let ariaLabel = "";
         switch (item.type) {
         case LineType.Unchanged:
             if (item.originalLineNumber === item.modifiedLineNumber) {
-                ariaLabel = ( localize(189, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(201, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
             } else {
                 ariaLabel = ( localize(
-                    190,
+                    202,
                     "{0} original line {1} modified line {2}",
                     lineContent,
                     item.originalLineNumber,
@@ -602,10 +602,10 @@ let View = class View extends Disposable {
             }
             break;
         case LineType.Added:
-            ariaLabel = ( localize(191, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+            ariaLabel = ( localize(203, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
             break;
         case LineType.Deleted:
-            ariaLabel = ( localize(192, "- {0} original line {1}", lineContent, item.originalLineNumber));
+            ariaLabel = ( localize(204, "- {0} original line {1}", lineContent, item.originalLineNumber));
             break;
         }
         row.setAttribute("aria-label", ariaLabel);

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -216,7 +216,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = "";
         }
         const ariaNavigationTip = ( localize(
-            193,
+            205,
             " use {0} to open the accessibility help.",
             this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp")?.getAriaLabel()
         ));

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js

@@ -67,7 +67,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( new Action(
                         "diff.clipboard.copyDeletedContent",
-                        isDeletion ? (_diff.original.length > 1 ? ( localize(194, "Copy deleted lines")) : ( localize(195, "Copy deleted line"))) : (_diff.original.length > 1 ? ( localize(196, "Copy changed lines")) : ( localize(197, "Copy changed line"))),
+                        isDeletion ? (_diff.original.length > 1 ? ( localize(206, "Copy deleted lines")) : ( localize(207, "Copy deleted line"))) : (_diff.original.length > 1 ? ( localize(208, "Copy changed lines")) : ( localize(209, "Copy changed line"))),
                         undefined,
                         true,
                         async () => {
@@ -77,11 +77,11 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     )));
                     if (_diff.original.length > 1) {
                         actions.push(( new Action("diff.clipboard.copyDeletedLineContent", isDeletion ? ( localize(
-                            198,
+                            210,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )) : ( localize(
-                            199,
+                            211,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -95,7 +95,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( new Action("diff.inline.revertChange", ( localize(200, "Revert this change")), undefined, true, async () => {
+                        actions.push(( new Action("diff.inline.revertChange", ( localize(212, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         })));
                     }

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js

@@ -14,7 +14,7 @@ registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleUseInlineViewWhenSpaceIsLimited()).desc.id,
-        title: ( localize(201, "Use Inline View When Space Is Limited")),
+        title: ( localize(213, "Use Inline View When Space Is Limited")),
         toggled: ( ContextKeyExpr.has("config.diffEditor.useInlineViewWhenSpaceIsLimited")),
         precondition: ( ContextKeyExpr.has("isInDiffEditor"))
     },
@@ -28,7 +28,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleShowMovedCodeBlocks()).desc.id,
-        title: ( localize(202, "Show Moved Code Blocks")),
+        title: ( localize(214, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create("config.diffEditor.experimental.showMoves", true),
         precondition: ( ContextKeyExpr.has("isInDiffEditor"))
@@ -48,7 +48,7 @@ for (const ctx of [{
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(203, "Revert Block")),
+            title: ( localize(215, "Revert Block")),
             icon: ctx.icon
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -58,7 +58,7 @@ for (const ctx of [{
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(204, "Revert Selection")),
+            title: ( localize(216, "Revert Selection")),
             icon: ctx.icon
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -73,7 +73,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localize(205, "Open Accessible Diff Viewer")),
+        title: ( localize(217, "Open Accessible Diff Viewer")),
         precondition: ( ContextKeyExpr.has("isInDiffEditor"))
     },
     order: 10,

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { RunOnceScheduler, rejectIfNotCanceled } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
@@ -28,7 +28,7 @@ import { derived } from '../../../../base/common/observableInternal/observables/
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 import { observableSignalFromEvent } from '../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 import { observableSignal } from '../../../../base/common/observableInternal/observables/observableSignal.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import { waitForState } from '../../../../base/common/observableInternal/utils/utilsCancellation.js';
 
 let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
@@ -223,7 +223,8 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             this._isDiffUpToDate.set(false, undefined);
             debouncer.schedule();
         }));
-        this._register(autorunWithStore(async (reader, store) => {
+        this._register(autorun(async reader => {
+            const store = reader.store;
             this._options.hideUnchangedRegionsMinimumLineCount.read(reader);
             this._options.hideUnchangedRegionsContextLineCount.read(reader);
             debouncer.cancel();
@@ -245,8 +246,8 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
                 ignoreTrimWhitespace: this._options.ignoreTrimWhitespace.read(reader),
                 maxComputationTimeMs: this._options.maxComputationTimeMs.read(reader),
                 computeMoves: this._options.showMoves.read(reader)
-            }, this._cancellationTokenSource.token);
-            if (this._cancellationTokenSource.token.isCancellationRequested) {
+            }, this._cancellationTokenSource.token).catch(rejectIfNotCanceled);
+            if (!result || this._cancellationTokenSource.token.isCancellationRequested) {
                 return;
             }
             if (model.original.isDisposed() || model.modified.isDisposed()) {
@@ -293,7 +294,12 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
         }
     }
     async waitForDiff() {
-        await waitForState(this.isDiffUpToDate, s => s);
+        await waitForState(
+            this.isDiffUpToDate,
+            s => s,
+            undefined,
+            this._cancellationTokenSource.token
+        ).catch(rejectIfNotCanceled);
     }
     serializeState() {
         const regions = this._unchangedRegions.get();

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -181,7 +181,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
             glyphMarginHoverMessage: ( new MarkdownString(undefined, {
                 isTrusted: true,
                 supportThemeIcons: true
-            })).appendMarkdown(( localize(206, "Fold Unchanged Region"))),
+            })).appendMarkdown(( localize(218, "Fold Unchanged Region"))),
             glyphMarginClassName: "fold-unchanged " + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001
         };
@@ -283,7 +283,7 @@ class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._register(autorun(reader => {
             if (!this._hide) {
                 const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(207, "{0} hidden lines", lineCount));
+                const linesHiddenText = ( localize(219, "{0} hidden lines", lineCount));
                 this._nodes.text.innerText = linesHiddenText;
             }
         }));
@@ -310,7 +310,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h("div.diff-hidden-lines", [h("div.top@top", {
-            title: ( localize(208, "Click or drag to show more above"))
+            title: ( localize(220, "Click or drag to show more above"))
         }), h("div.center@content", {
             style: {
                 display: "flex"
@@ -323,7 +323,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
                 flexShrink: "0"
             }
         }, [$("a", {
-            title: ( localize(209, "Show Unchanged Region")),
+            title: ( localize(221, "Show Unchanged Region")),
             role: "button",
             onclick: () => {
                 this._unchangedRegion.showAll(undefined);
@@ -335,7 +335,7 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
                 alignItems: "center"
             }
         })]), h("div.bottom@bottom", {
-            title: ( localize(210, "Click or drag to show more below")),
+            title: ( localize(222, "Click or drag to show more below")),
             role: "button"
         })]);
         root.root.appendChild(this._nodes.root);
@@ -453,9 +453,9 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(207, "{0} hidden lines", lineCount));
+                const linesHiddenText = ( localize(219, "{0} hidden lines", lineCount));
                 const span = $("span", {
-                    title: ( localize(211, "Double click to unfold"))
+                    title: ( localize(223, "Double click to unfold"))
                 }, linesHiddenText);
                 span.addEventListener("dblclick", e => {
                     if (e.button !== 0) {

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -301,24 +301,24 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === "original" ? ( localize(
-                212,
+                224,
                 "Code moved with changes to line {0}-{1}",
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                213,
+                225,
                 "Code moved with changes from line {0}-{1}",
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
             ));
         } else {
             text = this._kind === "original" ? ( localize(
-                214,
+                226,
                 "Code moved to line {0}-{1}",
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                215,
+                227,
                 "Code moved from line {0}-{1}",
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1

package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js

@@ -107,7 +107,7 @@ class RevertButton extends Disposable {
         this._revertSelection = _revertSelection;
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h("div.revertButton", {
-            title: this._revertSelection ? ( localize(216, "Revert Selected Changes")) : ( localize(217, "Revert Change"))
+            title: this._revertSelection ? ( localize(228, "Revert Selected Changes")) : ( localize(229, "Revert Change"))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -16,16 +16,16 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-registerColor("diffEditor.move.border", "#8b8b8b9c", ( localize(218, "The border color for text that got moved in the diff editor.")));
-registerColor("diffEditor.moveActive.border", "#FFA500", ( localize(219, "The active border color for text that got moved in the diff editor.")));
+registerColor("diffEditor.move.border", "#8b8b8b9c", ( localize(230, "The border color for text that got moved in the diff editor.")));
+registerColor("diffEditor.moveActive.border", "#FFA500", ( localize(231, "The active border color for text that got moved in the diff editor.")));
 registerColor("diffEditor.unchangedRegionShadow", {
     dark: "#000000",
     light: "#737373BF",
     hcDark: "#000000",
     hcLight: "#737373BF"
-}, ( localize(220, "The color of the shadow around unchanged region widgets.")));
-const diffInsertIcon = registerIcon("diff-insert", Codicon.add, ( localize(221, "Line decoration for inserts in the diff editor.")));
-const diffRemoveIcon = registerIcon("diff-remove", Codicon.remove, ( localize(222, "Line decoration for removals in the diff editor.")));
+}, ( localize(232, "The color of the shadow around unchanged region widgets.")));
+const diffInsertIcon = registerIcon("diff-insert", Codicon.add, ( localize(233, "Line decoration for inserts in the diff editor.")));
+const diffRemoveIcon = registerIcon("diff-remove", Codicon.remove, ( localize(234, "Line decoration for removals in the diff editor.")));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: "line-insert",
     description: "line-insert",

package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js

@@ -40,7 +40,7 @@ class EditorGutter extends Disposable {
                 width: "100%"
             }
         }).root);
-        const o = this._register(( new DisposableResizeObserver(() => {
+        const o = this._register(( new DisposableResizeObserver("EditorGutter.domNodeSizeChanged", () => {
             transaction(tx => {
                 this.domNodeSizeChanged.trigger(tx);
             });

package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js

@@ -137,7 +137,11 @@ function animatedObservable(targetWindow, base, store) {
         }
         startVal = curVal;
         targetVal = base.read(reader);
-        animationStartMs = Date.now() - (s.animate ? 0 : durationMs);
+        if (startVal === targetVal) {
+            animationStartMs = Date.now() - durationMs;
+        } else {
+            animationStartMs = Date.now() - (s.animate ? 0 : durationMs);
+        }
         update();
     }));
     function update() {

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

@@ -17,11 +17,11 @@ registerColor("multiDiffEditor.headerBackground", {
     light: "tab.inactiveBackground",
     hcDark: "tab.inactiveBackground",
     hcLight: "tab.inactiveBackground"
-}, ( localize(223, "The background color of the diff editor's header")));
-registerColor("multiDiffEditor.background", editorBackground, ( localize(224, "The background color of the multi file diff editor")));
+}, ( localize(235, "The background color of the diff editor's header")));
+registerColor("multiDiffEditor.background", editorBackground, ( localize(236, "The background color of the multi file diff editor")));
 registerColor("multiDiffEditor.border", {
     dark: "sideBarSectionHeader.border",
     light: "#cccccc",
     hcDark: "sideBarSectionHeader.border",
     hcLight: "#cccccc"
-}, ( localize(225, "The border color of the multi file diff editor")));
+}, ( localize(237, "The border color of the multi file diff editor")));

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

@@ -97,7 +97,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         this._headerHeight = 40;
         this._lastScrollTop = -1;
         this._isSettingScrollTop = false;
-        const btn = ( new Button(this._elements.collapseButton, {}));
+        const btn = this._register(( new Button(this._elements.collapseButton, {})));
         this._register(autorun(reader => {
             btn.element.className = "";
             btn.icon = this._collapsed.read(reader) ? Codicon.chevronRight : Codicon.chevronDown;

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
-import { IObservable, ITransaction } from "../../../../base/common/observable.js";
+import { IObservable, ITransaction, ObservablePromise } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { ContextKeyValue } from "../../../../platform/contextkey/common/contextkey.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
@@ -14,13 +14,14 @@ export declare class MultiDiffEditorViewModel extends Disposable {
     private readonly _documents;
     private readonly _documentsArr;
     readonly isLoading: import("../../../../base/common/observable.js").IObservableWithChange<boolean, void>;
+    private readonly _waitForNewDiffs;
     readonly items: IObservable<readonly DocumentDiffItemViewModel[]>;
     readonly focusedDiffItem: import("../../../../base/common/observable.js").IObservableWithChange<DocumentDiffItemViewModel | undefined, void>;
     readonly activeDiffItem: IObservable<DocumentDiffItemViewModel | undefined> & {
         clearCache(transaction: ITransaction): void;
         setCache(newValue: DocumentDiffItemViewModel | undefined, tx: ITransaction | undefined): void;
     };
-    waitForDiffs(): Promise<void>;
+    waitForDiffOr1s(): Promise<void>;
     collapseAll(): void;
     expandAll(): void;
     get contextKeys(): Record<string, ContextKeyValue> | undefined;
@@ -35,6 +36,7 @@ export declare class DocumentDiffItemViewModel extends Disposable {
     */
     readonly diffEditorViewModelRef: RefCounted<IDiffEditorViewModel>;
     get diffEditorViewModel(): IDiffEditorViewModel;
+    readonly waitForInitialDiffOr1s: ObservablePromise<void>;
     readonly collapsed: import("../../../../base/common/observable.js").ISettableObservable<boolean, void>;
     readonly lastTemplateData: import("../../../../base/common/observable.js").ISettableObservable<{
         contentHeight: number;
@@ -46,7 +48,7 @@ export declare class DocumentDiffItemViewModel extends Disposable {
     private readonly _isFocusedSource;
     readonly isFocused: import("../../../../base/common/observable.js").IObservableWithChange<boolean, void>;
     setIsFocused(source: IObservable<boolean>, tx: ITransaction | undefined): void;
-    private readonly documentDiffItemRef;
+    private readonly _documentDiffItemRef;
     get documentDiffItem(): IDocumentDiffItem;
     readonly isAlive: import("../../../../base/common/observable.js").ISettableObservable<boolean, void>;
     constructor(documentDiffItem: RefCounted<IDocumentDiffItem>, _editorViewModel: MultiDiffEditorViewModel, _instantiationService: IInstantiationService, _modelService: IModelService);

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

@@ -2,23 +2,28 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
+import { rejectIfNotCanceled, timeout } from '../../../../base/common/async.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IModelService } from '../../../common/services/model.service.js';
 import { DiffEditorOptions } from '../diffEditor/diffEditorOptions.js';
 import { DiffEditorViewModel } from '../diffEditor/diffEditorViewModel.js';
 import { RefCounted } from '../diffEditor/utils.js';
+import { cancelOnDispose } from '../../../../base/common/cancellation.js';
+import { waitForState } from '../../../../base/common/observableInternal/utils/utilsCancellation.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
-import { observableFromValueWithChangeEvent } from '../../../../base/common/observableInternal/utils/valueWithChangeEvent.js';
 import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
-import { mapObservableArrayCached, derivedObservableWithWritableCache } from '../../../../base/common/observableInternal/utils/utils.js';
+import { derivedObservableWithWritableCache, mapObservableArrayCached } from '../../../../base/common/observableInternal/utils/utils.js';
+import { observableFromValueWithChangeEvent } from '../../../../base/common/observableInternal/utils/valueWithChangeEvent.js';
+import { ObservablePromise, ObservableResolvedPromise } from '../../../../base/common/observableInternal/utils/promise.js';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { constObservable } from '../../../../base/common/observableInternal/observables/constObservable.js';
 
 class MultiDiffEditorViewModel extends Disposable {
-    async waitForDiffs() {
-        for (const d of this.items.get()) {
-            await d.diffEditorViewModel.waitForDiff();
+    async waitForDiffOr1s() {
+        if (this._documents.get() === "loading") {
+            await waitForState(this._documents, documents => documents !== "loading");
         }
+        await this._waitForNewDiffs.get().promise;
     }
     collapseAll() {
         transaction(tx => {
@@ -41,7 +46,6 @@ class MultiDiffEditorViewModel extends Disposable {
         super();
         this.model = model;
         this._instantiationService = _instantiationService;
-        this._documents = observableFromValueWithChangeEvent(this.model, this.model.documents);
         this._documentsArr = derived(this, reader => {
             const result = this._documents.read(reader);
             if (result === "loading") {
@@ -49,10 +53,6 @@ class MultiDiffEditorViewModel extends Disposable {
             }
             return result;
         });
-        this.isLoading = derived(this, reader => this._documents.read(reader) === "loading");
-        this.items = mapObservableArrayCached(this, this._documentsArr, (d, store) => store.add(
-            this._instantiationService.createInstance(DocumentDiffItemViewModel, d, this)
-        )).recomputeInitiallyAndOnChange(this._store);
         this.focusedDiffItem = derived(
             this,
             reader => this.items.read(reader).find(i => i.isFocused.read(reader))
@@ -61,6 +61,30 @@ class MultiDiffEditorViewModel extends Disposable {
             this,
             (reader, lastValue) => this.focusedDiffItem.read(reader) ?? (lastValue && this.items.read(reader).indexOf(lastValue) !== -1) ? lastValue : undefined
         );
+        this._documents = observableFromValueWithChangeEvent(this.model, this.model.documents);
+        const allItems = mapObservableArrayCached(this, this._documentsArr, (d, store) => store.add(RefCounted.create(
+            this._instantiationService.createInstance(DocumentDiffItemViewModel, d, this)
+        ))).recomputeInitiallyAndOnChange(this._store);
+        this._waitForNewDiffs = derived(this, reader => {
+            const next = allItems.read(reader);
+            const unresolved = next.filter(i => !i.object.waitForInitialDiffOr1s.promiseResult.read(undefined));
+            if (unresolved.length === 0) {
+                return ObservablePromise.resolved(next);
+            }
+            return ( new ObservablePromise(Promise.all(( unresolved.map(i => i.object.waitForInitialDiffOr1s.promise))).then(() => next)));
+        });
+        const resolved = ( new ObservableResolvedPromise(this._waitForNewDiffs, [], this._store));
+        this.items = derived(this, reader => {
+            const resolvedItems = resolved.lastResolved.read(reader);
+            return ( resolvedItems.map(i => {
+                const ref = reader.store.add(i.createNewRef(i));
+                return ref.object;
+            }));
+        });
+        this.isLoading = derived(
+            this,
+            reader => this._documents.read(reader) === "loading" || resolved.isResolving.read(reader)
+        );
     }
 }
 let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposable {
@@ -77,7 +101,7 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
         this._isFocusedSource.set(source, tx);
     }
     get documentDiffItem() {
-        return this.documentDiffItemRef.object;
+        return this._documentDiffItemRef.object;
     }
     constructor(documentDiffItem, _editorViewModel, _instantiationService, _modelService) {
         super();
@@ -96,7 +120,7 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
         this._register(toDisposable(() => {
             this.isAlive.set(false, undefined);
         }));
-        this.documentDiffItemRef = this._register(documentDiffItem.createNewRef(this));
+        this._documentDiffItemRef = this._register(documentDiffItem.createNewRef(this));
         function updateOptions(options) {
             return {
                 ...options,
@@ -114,13 +138,17 @@ let DocumentDiffItemViewModel = class DocumentDiffItemViewModel extends Disposab
         const diffEditorViewModelStore = ( new DisposableStore());
         const originalTextModel = this.documentDiffItem.original ?? diffEditorViewModelStore.add(this._modelService.createModel("", null));
         const modifiedTextModel = this.documentDiffItem.modified ?? diffEditorViewModelStore.add(this._modelService.createModel("", null));
-        diffEditorViewModelStore.add(this.documentDiffItemRef.createNewRef(this));
+        diffEditorViewModelStore.add(this._documentDiffItemRef.createNewRef(this));
         this.diffEditorViewModelRef = this._register(
             RefCounted.createWithDisposable(this._instantiationService.createInstance(DiffEditorViewModel, {
                 original: originalTextModel,
                 modified: modifiedTextModel
             }, options), diffEditorViewModelStore, this)
         );
+        this.waitForInitialDiffOr1s = ( new ObservablePromise(Promise.race([
+            this.diffEditorViewModel.waitForDiff().catch(rejectIfNotCanceled),
+            timeout(1000, cancelOnDispose(this._store)).catch(rejectIfNotCanceled)
+        ])));
     }
     getKey() {
         return JSON.stringify([this.originalUri?.toString(), this.modifiedUri?.toString()]);

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

@@ -161,7 +161,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 return undefined;
             }
             const vm = this._viewModel.read(reader);
-            return (!vm || vm.isLoading.read(reader)) ? ( localize(226, "Loading...")) : ( localize(227, "No Changed Files"));
+            return (!vm || vm.isLoading.read(reader)) ? ( localize(238, "Loading...")) : ( localize(239, "No Changed Files"));
         });
         this._register(autorun(reader => {
             const message = placeholderMessage.read(reader);