@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js

@@ -1,36 +1,6 @@
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
-import { LineRange } from '../../../../editor/common/core/lineRange.js';
-import { Range } from '../../../../editor/common/core/range.js';
 import { AsyncIterableSource } from '../../../../base/common/async.js';
 import { getNWords } from '../../chat/common/chatWordCounter.js';
-function invertLineRange(range, model) {
-    if (range.isEmpty) {
-        return [];
-    }
-    const result = [];
-    if (range.startLineNumber > 1) {
-        result.push(( new LineRange(1, range.startLineNumber)));
-    }
-    if (range.endLineNumberExclusive < model.getLineCount() + 1) {
-        result.push(( new LineRange(range.endLineNumberExclusive, model.getLineCount() + 1)));
-    }
-    return result.filter(r => !r.isEmpty);
-}
-function asRange(lineRange, model) {
-    return lineRange.isEmpty
-        ? ( new Range(
-        lineRange.startLineNumber,
-        1,
-        lineRange.startLineNumber,
-        model.getLineLength(lineRange.startLineNumber)
-    ))
-        : ( new Range(
-        lineRange.startLineNumber,
-        1,
-        lineRange.endLineNumberExclusive - 1,
-        model.getLineLength(lineRange.endLineNumberExclusive - 1)
-    ));
-}
 async function performAsyncTextEdit(model, edit, progress, obs) {
     const [id] = model.deltaDecorations([], [{
             range: edit.range,
@@ -86,4 +56,4 @@ function asProgressiveEdit(interval, edit, wordsPerSec, token) {
         newText: stream.asyncIterable
     };
 }
-export { asProgressiveEdit, asRange, invertLineRange, performAsyncTextEdit };
+export { asProgressiveEdit, performAsyncTextEdit };

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -67,12 +67,11 @@ const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
 const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const MENU_INLINE_CHAT_WIDGET_FEEDBACK = MenuId.for('inlineChatWidget.feedback');
 const MENU_INLINE_CHAT_WIDGET_DISCARD = MenuId.for('inlineChatWidget.undo');
 const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 21, "Background color of the interactive editor widget")));
 registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 22, "Border color of the interactive editor widget")));
 registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localizeWithPath(_moduleId, 23, "Shadow color of the interactive editor widget")));
-const inlineChatRegionHighlight = registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localizeWithPath(
+registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localizeWithPath(
     _moduleId,
     24,
     "Background highlighting of the current interactive region. Must be transparent."
@@ -95,6 +94,11 @@ const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.i
     30,
     'Overview ruler marker color for inline chat inserted content.'
 )));
+const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localizeWithPath(
+    _moduleId,
+    30,
+    'Overview ruler marker color for inline chat inserted content.'
+)));
 registerColor('inlineChatDiff.removed', { dark: ( (transparent(diffRemoved, .5))), light: ( (transparent(diffRemoved, .5))), hcDark: ( (transparent(diffRemoved, .5))), hcLight: ( (transparent(diffRemoved, .5))) }, ( localizeWithPath(
     _moduleId,
     31,
@@ -180,4 +184,4 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(di
         }
     }
 });
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatRegionHighlight, overviewRulerInlineChatDiffInserted };
+export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js

@@ -138,7 +138,11 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         if (!target) {
             return undefined;
         }
-        return await this._editorModelReference.saveAs(target);
+        const saved = await this._editorModelReference.saveAs(target);
+        if (saved && 'resource' in saved && saved.resource) {
+            this._notebookService.getNotebookTextModel(saved.resource)?.dispose();
+        }
+        return saved;
     }
     matches(otherInput) {
         if (super.matches(otherInput)) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { assertFn } from '../../../../base/common/assert.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -8,6 +8,7 @@ import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/arrays.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,5 +1,6 @@
 import '../../../../../base/browser/dom.js';
 import '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/arrays.js';
 import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js

@@ -4,7 +4,7 @@ import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.j
 import { DetailedLineRangeMapping } from './mapping.js';
 import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
-import { ReentrancyBarrier } from '../utils.js';
+import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
 import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
 import '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
@@ -12,7 +12,7 @@ import { observableSignal } from '../../../../../base/common/observableInternal/
 import '../../../../../base/common/cancellation.js';
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
-        return this._barrier.isActive;
+        return this._barrier.isOccupied;
     }
     constructor(baseTextModel, textModel, diffComputer) {
         super();
@@ -30,10 +30,10 @@ class TextModelDiffs extends Disposable {
             recomputeSignal.read(reader);
             this._recompute(reader);
         }));
-        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusive(() => {
+        this._register(baseTextModel.onDidChangeContent(this._barrier.makeExclusiveOrSkip(() => {
             recomputeSignal.trigger(undefined);
         })));
-        this._register(textModel.onDidChangeContent(this._barrier.makeExclusive(() => {
+        this._register(textModel.onDidChangeContent(this._barrier.makeExclusiveOrSkip(() => {
             recomputeSignal.trigger(undefined);
         })));
         this._register(toDisposable(() => {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js

@@ -1,58 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CompareResult, ArrayQueue } from '../../../../base/common/arrays.js';
-import { onUnexpectedError, BugIndicatingError } from '../../../../base/common/errors.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-class ReentrancyBarrier {
-    constructor() {
-        this._isActive = false;
-    }
-    get isActive() {
-        return this._isActive;
-    }
-    makeExclusive(fn) {
-        return ((...args) => {
-            if (this._isActive) {
-                return;
-            }
-            this._isActive = true;
-            try {
-                return fn(...args);
-            }
-            finally {
-                this._isActive = false;
-            }
-        });
-    }
-    runExclusively(fn) {
-        if (this._isActive) {
-            return;
-        }
-        this._isActive = true;
-        try {
-            fn();
-        }
-        finally {
-            this._isActive = false;
-        }
-    }
-    runExclusivelyOrThrow(fn) {
-        if (this._isActive) {
-            throw ( new BugIndicatingError());
-        }
-        this._isActive = true;
-        try {
-            fn();
-        }
-        finally {
-            this._isActive = false;
-        }
-    }
-}
 function setStyle(element, style) {
     Object.entries(style).forEach(([key, value]) => {
         element.style.setProperty(key, toSize(value));
@@ -169,4 +123,4 @@ function observableConfigValue(key, defaultValue, configurationService) {
         }
     }), () => configurationService.getValue(key) ?? defaultValue);
 }
-export { PersistentStore, ReentrancyBarrier, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, observableConfigValue, setFields, setStyle, thenIfNotDisposed };
+export { PersistentStore, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, observableConfigValue, setFields, setStyle, thenIfNotDisposed };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -1,14 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { LazyStatefulPromise, raceTimeout } from '../../../../base/common/async.js';
 import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
-import { Event, Emitter } from '../../../../base/common/event.js';
+import { ValueWithChangeEvent, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { parse } from '../../../../base/common/marshalling.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { deepClone } from '../../../../base/common/objects.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, constObservable, mapObservableArrayCached } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromValueWithChangeEvent, constObservable, mapObservableArrayCached, recomputeInitiallyAndOnChange, ValueWithChangeEventFromObservable, observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import { ObservableLazyPromise } from '../../../../base/common/observableInternal/promise.js';
 import { isDefined, isObject } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -21,7 +22,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { MultiDiffEditorIcon } from './icons.contribution.js';
-import { MultiDiffEditorItem, ConstResolvedMultiDiffSource } from './multiDiffSourceResolverService.js';
+import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
 import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
 import { RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
@@ -78,19 +79,19 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         })));
         this._resolvedSource = ( (new ObservableLazyPromise(async () => {
             const source = this.initialResources
-                ? ( (new ConstResolvedMultiDiffSource(this.initialResources)))
+                ? { resources: ValueWithChangeEvent.const(this.initialResources) }
                 : await this._multiDiffSourceResolverService.resolve(this.multiDiffSource);
             return {
                 source,
-                resources: source ? observableFromEvent(source.onDidChange, () => source.resources) : constObservable([]),
+                resources: source ? observableFromValueWithChangeEvent(this, source.resources) : constObservable([]),
             };
         })));
-        this._resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
-        this._isDirtyObservables = mapObservableArrayCached(this, ( (this._resources.map(r => r || []))), res => {
+        this.resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
+        this._isDirtyObservables = mapObservableArrayCached(this, ( (this.resources.map(r => r ?? []))), res => {
             const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
             const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
             return derived(reader =>  isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
-        }, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
+        }, i => i.getKey());
         this._isDirtyObservable = derived(this, reader => ( (this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader)))))
             .keepObserved(this._store);
         this.onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
@@ -103,9 +104,14 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             }
         };
         this._register(autorun((reader) => {
-            const resources = this._resources.read(reader) ?? [];
+            const resources = this.resources.read(reader);
             const label = this.label ?? ( localizeWithPath(_moduleId, 0, "Multi Diff Editor"));
-            this._name = label + ( localizeWithPath(_moduleId, 1, " ({0} files)", resources?.length ?? 0));
+            if (resources) {
+                this._name = label + ( localizeWithPath(_moduleId, 1, " ({0} files)", resources.length));
+            }
+            else {
+                this._name = label;
+            }
             this._onDidChangeLabel.fire();
         }));
     }
@@ -138,7 +144,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         const source = await this._resolvedSource.getPromise();
         const textResourceConfigurationService = this._textResourceConfigurationService;
         const garbage = ( (new DisposableStore()));
-        const documentsWithPromises = mapObservableArrayCached(undefined, source.resources, async (r, store) => {
+        const documentsWithPromises = mapObservableArrayCached(this, source.resources, async (r, store) => {
             let original;
             let modified;
             const store2 = ( (new DisposableStore()));
@@ -151,10 +157,10 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
                     r.modified ? this._textModelService.createModelReference(r.modified) : undefined,
                 ]);
                 if (original) {
-                    store.add(original);
+                    store2.add(original);
                 }
                 if (modified) {
-                    store.add(modified);
+                    store2.add(modified);
                 }
             }
             catch (e) {
@@ -181,26 +187,25 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
                 }))
             );
         }, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
-        let documents = [];
-        const documentChangeEmitter = ( (new Emitter()));
-        const p = Event.toPromise(documentChangeEmitter.event);
-        const a = autorun(async (reader) => {
+        const documents = observableValue('documents', []);
+        const updateDocuments = derived(async (reader) => {
             const docsPromises = documentsWithPromises.read(reader);
             const docs = await Promise.all(docsPromises);
-            documents = docs.filter(isDefined);
-            documentChangeEmitter.fire();
+            const newDocuments = docs.filter(isDefined);
+            documents.set(newDocuments, undefined);
             garbage.clear();
         });
-        await p;
-        return {
+        const a = recomputeInitiallyAndOnChange(updateDocuments);
+        await updateDocuments.get();
+        const result = {
             dispose: () => {
                 a.dispose();
                 garbage.dispose();
             },
-            onDidChange: documentChangeEmitter.event,
-            get documents() { return documents; },
+            documents: ( (new ValueWithChangeEventFromObservable(documents))),
             contextKeys: source.source?.contextKeys,
         };
+        return result;
     }
     matches(otherInput) {
         if (super.matches(otherInput)) {

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js

@@ -1,12 +1,5 @@
-import { Event } from '../../../../base/common/event.js';
-import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
-class ConstResolvedMultiDiffSource {
-    constructor(resources) {
-        this.resources = resources;
-        this.onDidChange = Event.None;
-    }
-}
+import { toDisposable } from '../../../../base/common/lifecycle.js';
 class MultiDiffEditorItem {
     constructor(original, modified) {
         this.original = original;
@@ -15,6 +8,9 @@ class MultiDiffEditorItem {
             throw ( new BugIndicatingError('Invalid arguments'));
         }
     }
+    getKey() {
+        return JSON.stringify([this.modified?.toString(), this.original?.toString()]);
+    }
 }
 class MultiDiffSourceResolverService {
     constructor() {
@@ -36,4 +32,4 @@ class MultiDiffSourceResolverService {
         return Promise.resolve(undefined);
     }
 }
-export { ConstResolvedMultiDiffSource, MultiDiffEditorItem, MultiDiffSourceResolverService };
+export { MultiDiffEditorItem, MultiDiffSourceResolverService };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -0,0 +1,112 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/arrays.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, ValueWithChangeEventFromObservable } from '../../../../base/common/observableInternal/utils.js';
+import { waitForState } from '../../../../base/common/observableInternal/promise.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize2WithPath } from '../../../../nls.js';
+import { Action2 } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
+import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
+import { ISCMService } from '../../scm/common/scm.service.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+var ScmMultiDiffSourceResolver_1;
+const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver";
+let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
+    static { ScmMultiDiffSourceResolver_1 = this; }
+    static { this._scheme = 'scm-multi-diff-source'; }
+    static getMultiDiffSourceUri(repositoryUri, groupId) {
+        return (
+             (URI.from({
+                scheme: ScmMultiDiffSourceResolver_1._scheme,
+                query: JSON.stringify({ repositoryUri, groupId }),
+            }))
+        );
+    }
+    static parseUri(uri) {
+        if (uri.scheme !== ScmMultiDiffSourceResolver_1._scheme) {
+            return undefined;
+        }
+        let query;
+        try {
+            query = JSON.parse(uri.query);
+        }
+        catch (e) {
+            return undefined;
+        }
+        if (typeof query !== 'object' || query === null) {
+            return undefined;
+        }
+        const { repositoryUri, groupId } = query;
+        if (typeof repositoryUri !== 'string' || typeof groupId !== 'string') {
+            return undefined;
+        }
+        return { repositoryUri: ( (URI.parse(repositoryUri))), groupId };
+    }
+    constructor(_scmService) {
+        this._scmService = _scmService;
+    }
+    canHandleUri(uri) {
+        return ScmMultiDiffSourceResolver_1.parseUri(uri) !== undefined;
+    }
+    async resolveDiffSource(uri) {
+        const { repositoryUri, groupId } = ScmMultiDiffSourceResolver_1.parseUri(uri);
+        const repository = await waitForState(observableFromEvent(this._scmService.onDidAddRepository, () => [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( (repositoryUri.toString())))));
+        const group = await waitForState(observableFromEvent(repository.provider.onDidChangeResourceGroups, () => repository.provider.groups.find(g => g.id === groupId)));
+        return (
+             (new ScmResolvedMultiDiffSource(group, repository))
+        );
+    }
+};
+ScmMultiDiffSourceResolver = ScmMultiDiffSourceResolver_1 = ( (__decorate([
+    ( (__param(0, ISCMService)))
+], ScmMultiDiffSourceResolver)));
+class ScmResolvedMultiDiffSource {
+    constructor(_group, _repository) {
+        this._group = _group;
+        this._repository = _repository;
+        this._resources = observableFromEvent(this._group.onDidChangeResources, () => (  (this._group.resources.map(
+            e => ( (new MultiDiffEditorItem(e.multiDiffEditorOriginalUri, e.multiDiffEditorModifiedUri)))
+        ))));
+        this.resources = ( (new ValueWithChangeEventFromObservable(this._resources)));
+        this.contextKeys = {
+            scmResourceGroup: this._group.id,
+            scmProvider: this._repository.provider.contextValue,
+        };
+    }
+}
+let ScmMultiDiffSourceResolverContribution = class ScmMultiDiffSourceResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.scmMultiDiffSourceResolver'; }
+    constructor(instantiationService, multiDiffSourceResolverService) {
+        super();
+        this._register(multiDiffSourceResolverService.registerResolver(instantiationService.createInstance(ScmMultiDiffSourceResolver)));
+    }
+};
+ScmMultiDiffSourceResolverContribution = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IMultiDiffSourceResolverService)))
+], ScmMultiDiffSourceResolverContribution)));
+class OpenScmGroupAction extends Action2 {
+    static async openMultiFileDiffEditor(editorService, label, repositoryRootUri, resourceGroupId, options) {
+        if (!repositoryRootUri) {
+            return;
+        }
+        const multiDiffSource = ScmMultiDiffSourceResolver.getMultiDiffSourceUri(( (repositoryRootUri.toString())), resourceGroupId);
+        return await editorService.openEditor({ label, multiDiffSource, options });
+    }
+    constructor() {
+        super({
+            id: '_workbench.openScmMultiDiffEditor',
+            title: ( localize2WithPath(_moduleId, 0, 'View Changes')),
+            f1: false
+        });
+    }
+    async run(accessor, options) {
+        const editorService = accessor.get(IEditorService);
+        await OpenScmGroupAction.openMultiFileDiffEditor(editorService, options.title, URI.revive(options.repositoryUri), options.resourceGroupId);
+    }
+}
+export { OpenScmGroupAction, ScmMultiDiffSourceResolver, ScmMultiDiffSourceResolverContribution };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js

@@ -29,6 +29,7 @@ import { Sash } from '../../../../../../base/browser/ui/sash/sash.js';
 import { defaultProgressBarStyles, defaultInputBoxStyles, defaultToggleStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { NotebookSetting } from '../../../common/notebookCommon.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget";
 const NLS_FIND_INPUT_LABEL = ( localizeWithPath(_moduleId, 0, "Find"));
 const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 1, "Find"));
@@ -152,7 +153,7 @@ class NotebookFindInputFilterButton extends Disposable {
     get container() {
         return this._filterButtonContainer;
     }
-    get width() {
+    width() {
         return 2  + 2  + 2  + 16 ;
     }
     enable() {
@@ -161,6 +162,12 @@ class NotebookFindInputFilterButton extends Disposable {
     disable() {
         this.container.setAttribute('aria-disabled', String(true));
     }
+    set visible(visible) {
+        this._filterButtonContainer.style.display = visible ? '' : 'none';
+    }
+    get visible() {
+        return this._filterButtonContainer.style.display !== 'none';
+    }
     applyStyles(filterChecked) {
         const toggleStyles = this._toggleStyles;
         this._filterButtonContainer.style.border = '1px solid transparent';
@@ -190,7 +197,7 @@ class NotebookFindInput extends FindInput {
         this._filterChecked = false;
         this._register(registerAndCreateHistoryNavigationContext(contextKeyService, this.inputBox));
         this._findFilter = this._register(( (new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options))));
-        this.inputBox.paddingRight = (this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0) + this._findFilter.width;
+        this.inputBox.paddingRight = (this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0) + this._findFilter.width();
         this.controls.appendChild(this._findFilter.container);
     }
     setEnabled(enabled) {
@@ -227,7 +234,7 @@ class NotebookFindInput extends FindInput {
     }
 }
 let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
-    constructor(_contextViewService, contextKeyService, _configurationService, contextMenuService, instantiationService, _state = ( (new FindReplaceState())), _notebookEditor) {
+    constructor(_contextViewService, contextKeyService, _configurationService, contextMenuService, instantiationService, hoverService, _state = ( (new FindReplaceState())), _notebookEditor) {
         super();
         this._contextViewService = _contextViewService;
         this._configurationService = _configurationService;
@@ -267,7 +274,7 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
                     this._state.change({ isReplaceRevealed: this._isReplaceVisible }, false);
                     this._updateReplaceViewDisplay();
                 }
-        }))));
+        }, hoverService))));
         this._toggleReplaceBtn.setEnabled(!isInteractiveWindow);
         this._toggleReplaceBtn.setExpanded(this._isReplaceVisible);
         this._domNode.appendChild(this._toggleReplaceBtn.domNode);
@@ -337,21 +344,21 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
             onTrigger: () => {
                 this.find(true);
             }
-        }))));
+        }, hoverService))));
         this.nextBtn = this._register(( (new SimpleButton({
             label: NLS_NEXT_MATCH_BTN_LABEL,
             icon: findNextMatchIcon,
             onTrigger: () => {
                 this.find(false);
             }
-        }))));
+        }, hoverService))));
         const closeBtn = this._register(( (new SimpleButton({
             label: NLS_CLOSE_BTN_LABEL,
             icon: widgetClose,
             onTrigger: () => {
                 this.hide();
             }
-        }))));
+        }, hoverService))));
         this._innerFindDomNode.appendChild(this._findInput.domNode);
         this._innerFindDomNode.appendChild(this._matchesCount);
         this._innerFindDomNode.appendChild(this.prevBtn.domNode);
@@ -398,14 +405,14 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
             onTrigger: () => {
                 this.replaceOne();
             }
-        }))));
+        }, hoverService))));
         this._replaceAllBtn = this._register(( (new SimpleButton({
             label: NLS_REPLACE_ALL_BTN_LABEL,
             icon: findReplaceAllIcon,
             onTrigger: () => {
                 this.replaceAll();
             }
-        }))));
+        }, hoverService))));
         this._innerReplaceDomNode.appendChild(this._replaceBtn.domNode);
         this._innerReplaceDomNode.appendChild(this._replaceAllBtn.domNode);
         this._resizeSash = this._register(( (new Sash(
@@ -594,7 +601,8 @@ SimpleFindReplaceWidget = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IConfigurationService))),
     ( (__param(3, IContextMenuService))),
-    ( (__param(4, IInstantiationService)))
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IHoverService)))
 ], SimpleFindReplaceWidget)));
 registerThemingParticipant((theme, collector) => {
     collector.addRule(`

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -8,10 +8,10 @@ import { MATCHES_LIMIT } from '../../../../../../editor/contrib/find/browser/fin
 import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
 import { NLS_NO_RESULTS, NLS_MATCHES_LOCATION } from '../../../../../../editor/contrib/find/browser/findWidget.js';
 import { localizeWithPath } from '../../../../../../nls.js';
-import { IMenuService } from '../../../../../../platform/actions/common/actions.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { FindModel } from './findModel.js';
 import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
@@ -46,8 +46,8 @@ NotebookFindContrib = ( (__decorate([
     ( (__param(1, IInstantiationService)))
 ], NotebookFindContrib)));
 let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidget {
-    constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, menuService, instantiationService) {
-        super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, ( (new FindReplaceState())), _notebookEditor);
+    constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, hoverService, instantiationService) {
+        super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, hoverService, ( (new FindReplaceState())), _notebookEditor);
         this._showTimeout = null;
         this._hideTimeout = null;
         this._findModel = ( (new FindModel(this._notebookEditor, this._state, this._configurationService)));
@@ -293,7 +293,7 @@ NotebookFindWidget = ( (__decorate([
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IConfigurationService))),
     ( (__param(4, IContextMenuService))),
-    ( (__param(5, IMenuService))),
+    ( (__param(5, IHoverService))),
     ( (__param(6, IInstantiationService)))
 ], NotebookFindWidget)));
 export { NotebookFindContrib };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js

@@ -24,9 +24,14 @@ registerAction2(class CopyCellOutputAction extends Action2 {
             icon: copyIcon,
         });
     }
+    getNoteboookEditor(editorService, outputContext) {
+        if (outputContext && 'notebookEditor' in outputContext) {
+            return outputContext.notebookEditor;
+        }
+        return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    }
     async run(accessor, outputContext) {
-        const editorService = accessor.get(IEditorService);
-        const notebookEditor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+        const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
         if (!notebookEditor) {
             return;
         }