@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -12,8 +12,8 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { preventEditorClose, EditorResourceAccessor, SideBySideEditor, EditorCloseMethod } from '../../../../common/editor.js';
 import { SaveAllInGroupAction, CloseGroupAction } from '../fileActions.js';
 import { OpenEditor, OpenEditorsFocusedContext, ExplorerFocusedContext } from '../../common/files.js';
-import { CloseEditorAction, UnpinEditorAction } from '../../../../browser/parts/editor/editorActions.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { CloseEditorAction, UnpinEditorAction, CloseAllEditorsAction } from '../../../../browser/parts/editor/editorActions.js';
+import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
@@ -21,9 +21,9 @@ import { ResourceLabels } from '../../../../browser/labels.js';
 import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext } from '../fileConstants.js';
-import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { MenuId, registerAction2, Action2, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from '../fileConstants.js';
+import { ResourceContextKey, MultipleEditorGroupsContext } from '../../../../common/contextkeys.js';
 import { containsDragType, CodeDataTransfers } from 'monaco-editor/esm/vs/platform/dnd/browser/dnd.js';
 import { ResourcesDropHandler, fillEditorsDragData } from '../../../../browser/dnd.js';
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
@@ -35,8 +35,11 @@ import { IFilesConfigurationService } from '../../../../services/filesConfigurat
 import { IViewDescriptorService } from '../../../../common/views.js';
 import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
 import { compareFileNamesDefault } from 'monaco-editor/esm/vs/base/common/comparers.js';
+import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
+import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { extUriIgnorePathCase } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 var OpenEditorsView_1;
 const $ = dom.$;
 let OpenEditorsView = class OpenEditorsView extends ViewPane {
@@ -44,7 +47,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     static { this.DEFAULT_VISIBLE_OPEN_EDITORS = 9; }
     static { this.DEFAULT_MIN_VISIBLE_OPEN_EDITORS = 0; }
     static { this.ID = 'workbench.explorer.openEditorsView'; }
-    static { this.NAME = ( nls.localizeWithPath(
+    static { this.NAME = ( nls.localize2WithPath(
         'vs/workbench/contrib/files/browser/views/openEditorsView',
         { key: 'openEditors', comment: ['Open is an adjective'] },
         "Open Editors"
@@ -56,6 +59,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.filesConfigurationService = filesConfigurationService;
         this.needsRefresh = false;
         this.elements = [];
+        this.blockFocusActiveEditorTracking = false;
         this.structuralRefreshDelay = 0;
         this.sortOrder = configurationService.getValue('explorer.openEditors.sortOrder');
         this.registerUpdateEvents();
@@ -82,26 +86,26 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                 }
                 const index = this.getIndex(group, e.editor);
                 switch (e.kind) {
-                    case 6 :
-                    case 0 :
+                    case 7 :
                         this.focusActiveEditor();
                         break;
                     case 1 :
+                    case 2 :
                         if (index >= 0) {
                             this.list.splice(index, 1, [group]);
                         }
                         break;
+                    case 12 :
                     case 11 :
+                    case 9 :
                     case 10 :
                     case 8 :
-                    case 9 :
-                    case 7 :
                         this.list.splice(index, 1, [( new OpenEditor(e.editor, group))]);
                         this.focusActiveEditor();
                         break;
-                    case 3 :
-                    case 5 :
                     case 4 :
+                    case 6 :
+                    case 5 :
                         updateWholeList();
                         break;
                 }
@@ -115,6 +119,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             updateWholeList();
         }));
         this._register(this.editorGroupService.onDidMoveGroup(() => updateWholeList()));
+        this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.focusActiveEditor()));
         this._register(this.editorGroupService.onDidRemoveGroup(group => {
             dispose(groupDisposables.get(group.id));
             updateWholeList();
@@ -215,17 +220,25 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             }
         }));
         this._register(this.list.onDidOpen(e => {
-            if (!e.element) {
+            const element = e.element;
+            if (!element) {
                 return;
             }
-            else if (e.element instanceof OpenEditor) {
-                if (e.browserEvent instanceof MouseEvent && e.browserEvent.button === 1) {
+            else if (element instanceof OpenEditor) {
+                if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.button === 1) {
                     return;
                 }
-                this.openEditor(e.element, { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned, sideBySide: e.sideBySide });
+                this.withActiveEditorFocusTrackingDisabled(() => {
+                    this.openEditor(element, { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned, sideBySide: e.sideBySide });
+                });
             }
             else {
-                this.editorGroupService.activateGroup(e.element);
+                this.withActiveEditorFocusTrackingDisabled(() => {
+                    this.editorGroupService.activateGroup(element);
+                    if (!e.editorOptions.preserveFocus) {
+                        element.focus();
+                    }
+                });
             }
         }));
         this.listRefreshScheduler.schedule(0);
@@ -241,10 +254,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     }
     focus() {
         super.focus();
-        this.list.domFocus();
-    }
-    getList() {
-        return this.list;
+        this.list?.domFocus();
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
@@ -311,7 +321,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             if (!preserveActivateGroup) {
                 this.editorGroupService.activateGroup(element.group);
             }
-            const targetGroup = options.sideBySide ? this.editorGroupService.sideGroup : this.editorGroupService.activeGroup;
+            const targetGroup = options.sideBySide ? this.editorGroupService.sideGroup : element.group;
             targetGroup.openEditor(element.editor, options);
         }
     }
@@ -323,12 +333,24 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.contextMenuService.showContextMenu({
             menuId: MenuId.OpenEditorsContext,
             menuActionOptions: { shouldForwardArgs: true, arg: element instanceof OpenEditor ? EditorResourceAccessor.getOriginalUri(element.editor) : {} },
-            contextKeyService: this.list.contextKeyService,
+            contextKeyService: this.list?.contextKeyService,
             getAnchor: () => e.anchor,
             getActionsContext: () => element instanceof OpenEditor ? { groupId: element.groupId, editorIndex: element.group.getIndexOfEditor(element.editor) } : { groupId: element.id }
         });
     }
+    withActiveEditorFocusTrackingDisabled(fn) {
+        this.blockFocusActiveEditorTracking = true;
+        try {
+            fn();
+        }
+        finally {
+            this.blockFocusActiveEditorTracking = false;
+        }
+    }
     focusActiveEditor() {
+        if (!this.list || this.blockFocusActiveEditorTracking) {
+            return;
+        }
         if (this.list.length && this.editorGroupService.activeGroup) {
             const index = this.getIndex(this.editorGroupService.activeGroup, this.editorGroupService.activeGroup.activeEditor);
             if (index >= 0) {
@@ -409,6 +431,9 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.structuralRefreshDelay = delay;
     }
     getOptimalWidth() {
+        if (!this.list) {
+            return super.getOptimalWidth();
+        }
         const parentNode = this.list.getHTMLElement();
         const childNodes = [].slice.call(parentNode.querySelectorAll('.open-editor > a'));
         return dom.getLargestChildWidth(parentNode, childNodes);
@@ -584,7 +609,7 @@ class OpenEditorsDragAndDrop {
             this.editorGroupService.activateGroup(group);
         }
         else {
-            this.dropHandler.handleDrop(originalEvent, () => group, () => group.focus(), { index });
+            this.dropHandler.handleDrop(originalEvent, mainWindow, () => group, () => group.focus(), { index });
         }
     }
     dispose() { }
@@ -608,8 +633,38 @@ class OpenEditorsAccessibilityProvider {
     }
 }
 const toggleEditorGroupLayoutId = 'workbench.action.toggleEditorGroupLayout';
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.toggleEditorGroupLayout',
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/files/browser/views/openEditorsView',
+                'flipLayout',
+                "Toggle Vertical/Horizontal Editor Layout"
+            )), original: 'Toggle Vertical/Horizontal Editor Layout' },
+            f1: true,
+            keybinding: {
+                primary: 1024  | 512  | 21 ,
+                mac: { primary: 2048  | 512  | 21  },
+                weight: 200
+            },
+            icon: Codicon.editorLayout,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', OpenEditorsView.ID)), MultipleEditorGroupsContext)),
+                order: 10
+            }
+        });
+    }
+    async run(accessor) {
+        const editorGroupService = accessor.get(IEditorGroupsService);
+        const newOrientation = ((editorGroupService.orientation === 1) ) ? 0  : 1 ;
+        editorGroupService.setGroupOrientation(newOrientation);
+    }
+});
 MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-    group: '4_flip',
+    group: '5_flip',
     command: {
         id: toggleEditorGroupLayoutId,
         title: {
@@ -628,4 +683,69 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     },
     order: 1
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.files.saveAll',
+            title: { value: SAVE_ALL_LABEL, original: 'Save All' },
+            f1: true,
+            icon: Codicon.saveAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 20
+            }
+        });
+    }
+    async run(accessor) {
+        const commandService = accessor.get(ICommandService);
+        await commandService.executeCommand(SAVE_ALL_COMMAND_ID);
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'openEditors.closeAll',
+            title: CloseAllEditorsAction.LABEL,
+            f1: false,
+            icon: Codicon.closeAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 30
+            }
+        });
+    }
+    async run(accessor) {
+        const instantiationService = accessor.get(IInstantiationService);
+        const closeAll = ( new CloseAllEditorsAction());
+        await instantiationService.invokeFunction(accessor => closeAll.run(accessor));
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'openEditors.newUntitledFile',
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/files/browser/views/openEditorsView',
+                'newUntitledFile',
+                "New Untitled Text File"
+            )), original: 'New Untitled Text File' },
+            f1: false,
+            icon: Codicon.newFile,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 5
+            }
+        });
+    }
+    async run(accessor) {
+        const commandService = accessor.get(ICommandService);
+        await commandService.executeCommand(NEW_UNTITLED_FILE_COMMAND_ID);
+    }
+});
 export { OpenEditorsView };

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js

@@ -416,7 +416,7 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
         const provider = languageFeaturesService.documentRangeFormattingEditProvider.ordered(model);
         const pick = await instaService.invokeFunction(showFormatterPick, model, provider);
         if (typeof pick === 'number') {
-            await instaService.invokeFunction(formatDocumentRangesWithProvider, provider[pick], editor, range, CancellationToken.None);
+            await instaService.invokeFunction(formatDocumentRangesWithProvider, provider[pick], editor, range, CancellationToken.None, true);
         }
         logFormatterTelemetry(telemetryService, 'range', provider, typeof pick === 'number' && provider[pick] || undefined);
     }

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -36,7 +36,7 @@ registerEditorAction(class FormatModifiedAction extends EditorAction {
         }
         const ranges = await instaService.invokeFunction(getModifiedRanges, editor.getModel());
         if (isNonEmptyArray(ranges)) {
-            return instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, 1 , Progress.None, CancellationToken.None);
+            return instaService.invokeFunction(formatDocumentRangesWithSelectedProvider, editor, ranges, 1 , Progress.None, CancellationToken.None, true);
         }
     }
 });

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

@@ -105,6 +105,42 @@ registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)),
             )),
             default: true,
             type: 'boolean'
+        },
+        'inlineChat.showGutterIcon': {
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/common/inlineChat',
+                'showGutterIcon',
+                "Controls when the gutter icon for spawning inline chat is shown."
+            )),
+            default: "never" ,
+            type: 'string',
+            enum: ["always" , "mouseover" , "never" ],
+            markdownEnumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'showGutterIcon.always',
+                    "Always show the gutter icon."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'showGutterIcon.mouseover',
+                    "Show the gutter icon when the mouse is over the icon."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/inlineChat/common/inlineChat',
+                    'showGutterIcon.never',
+                    "Never show the gutter icon."
+                )),
+            ]
+        },
+        'inlineChat.showToolbarIcon': {
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/common/inlineChat',
+                'showToolbarIcon',
+                "Controls whether the toolbar icon spawning the inline chat is enabled."
+            )),
+            default: false,
+            type: 'boolean'
         }
     }
 });

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -129,6 +129,7 @@ const NotebookSetting = {
     outputScrolling: 'notebook.output.scrolling',
     textOutputLineLimit: 'notebook.output.textLineLimit',
     formatOnSave: 'notebook.formatOnSave.enabled',
+    insertFinalNewline: 'notebook.insertFinalNewline',
     formatOnCellExecution: 'notebook.formatOnCellExecution',
     codeActionsOnSave: 'notebook.codeActionsOnSave',
     outputWordWrap: 'notebook.output.wordWrap',
@@ -144,7 +145,8 @@ const NotebookSetting = {
     remoteSaving: 'notebook.experimental.remoteSave',
     gotoSymbolsAllSymbols: 'notebook.gotoSymbols.showAllSymbols',
     scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
-    anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell'
+    anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell',
+    cellChat: 'notebook.experimental.cellChat'
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

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

@@ -1,3 +1,4 @@
+import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
 import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 const IPreferencesSearchService = ( createDecorator('preferencesSearchService'));
@@ -43,12 +44,14 @@ const POLICY_SETTING_TAG = 'hasPolicy';
 const WORKSPACE_TRUST_SETTING_TAG = 'workspaceTrust';
 const REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG = 'requireTrustedWorkspace';
 let cachedExtensionToggleData;
-async function getExperimentalExtensionToggleData(workbenchAssignmentService, environmentService, productService) {
+async function getExperimentalExtensionToggleData(extensionGalleryService, productService) {
+    if (!extensionGalleryService.isEnabled()) {
+        return undefined;
+    }
     if (cachedExtensionToggleData) {
         return cachedExtensionToggleData;
     }
-    const isTreatment = await workbenchAssignmentService.getTreatment('ExtensionToggleSettings');
-    if ((isTreatment || !environmentService.isBuilt) && productService.extensionRecommendations && productService.commonlyUsedSettings) {
+    if (productService.extensionRecommendations && productService.commonlyUsedSettings) {
         const settingsEditorRecommendedExtensions = {};
         ( Object.keys(productService.extensionRecommendations)).forEach(extensionId => {
             const extensionInfo = productService.extensionRecommendations[extensionId];
@@ -56,8 +59,26 @@ async function getExperimentalExtensionToggleData(workbenchAssignmentService, en
                 settingsEditorRecommendedExtensions[extensionId] = extensionInfo;
             }
         });
+        const recommendedExtensionsGalleryInfo = {};
+        for (const key in settingsEditorRecommendedExtensions) {
+            const extensionId = key;
+            const isStable = productService.quality === 'stable';
+            try {
+                const [extension] = await extensionGalleryService.getExtensions([{ id: extensionId, preRelease: !isStable }], CancellationToken.None);
+                if (extension) {
+                    recommendedExtensionsGalleryInfo[key] = extension;
+                }
+                else {
+                    return undefined;
+                }
+            }
+            catch (e) {
+                return undefined;
+            }
+        }
         cachedExtensionToggleData = {
             settingsEditorRecommendedExtensions,
+            recommendedExtensionsGalleryInfo,
             commonlyUsed: productService.commonlyUsedSettings
         };
         return cachedExtensionToggleData;

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -208,6 +208,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         if (usePosition) {
             this.show(position, height);
         }
+        this.editor.setPosition(position);
         this.editor.focus();
     }
     renderTitle(label) {
@@ -633,8 +634,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         this.enabled = false;
         this.gutterActionDisposables = ( new DisposableStore());
         this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
-        this.stylesheet = dom.createStyleSheet();
-        this._register(toDisposable(() => this.stylesheet.remove()));
+        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
         if (this.enabled) {
             this.isDirtyDiffVisible = isDirtyDiffVisible.bindTo(contextKeyService);
             this._register(editor.onDidChangeModel(() => this.close()));
@@ -1352,8 +1352,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.viewState = { width: 3, visibility: 'always' };
         this.items = ( new ResourceMap());
         this.transientDisposables = this._register(( new DisposableStore()));
-        this.stylesheet = dom.createStyleSheet();
-        this._register(toDisposable(() => this.stylesheet.parentElement.removeChild(this.stylesheet)));
+        this.stylesheet = dom.createStyleSheet(undefined, undefined, this._store);
         const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
         this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
         this.onDidChangeConfiguration();
@@ -1454,8 +1453,14 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         for (const [uri, item] of this.items) {
             for (const editorId of ( item.keys())) {
                 if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( uri.toString()) && editor.getId() === editorId)) {
-                    dispose(( item.values()));
-                    this.items.delete(uri);
+                    if (( item.has(editorId))) {
+                        const dirtyDiffItem = item.get(editorId);
+                        dirtyDiffItem?.dispose();
+                        item.delete(editorId);
+                        if (item.size === 0) {
+                            this.items.delete(uri);
+                        }
+                    }
                 }
             }
         }

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

@@ -2,7 +2,6 @@ import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/com
 const VIEWLET_ID = 'workbench.view.scm';
 const VIEW_PANE_ID = 'workbench.scm';
 const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
-const SYNC_VIEW_PANE_ID = 'workbench.scm.sync';
 const ISCMService = ( createDecorator('scm'));
 var SCMInputChangeReason;
 ( (function(SCMInputChangeReason) {
@@ -10,4 +9,4 @@ var SCMInputChangeReason;
     SCMInputChangeReason[SCMInputChangeReason["HistoryNext"] = 1] = "HistoryNext";
 })(SCMInputChangeReason || (SCMInputChangeReason = {})));
 const ISCMViewService = ( createDecorator('scmView'));
-export { ISCMService, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, SYNC_VIEW_PANE_ID, VIEWLET_ID, VIEW_PANE_ID };
+export { ISCMService, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers.js

@@ -0,0 +1,31 @@
+import { TextSearchMatch } from '../../../../services/search/common/search.js';
+import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
+import { genericCellMatchesToTextSearchMatches, rawCellPrefix } from '../../common/searchNotebookHelpers.js';
+function getIDFromINotebookCellMatch(match) {
+    if (isINotebookCellMatchWithModel(match)) {
+        return match.cell.id;
+    }
+    else {
+        return `${rawCellPrefix}${match.index}`;
+    }
+}
+function isINotebookFileMatchWithModel(object) {
+    return 'cellResults' in object && object.cellResults instanceof Array && object.cellResults.every(isINotebookCellMatchWithModel);
+}
+function isINotebookCellMatchWithModel(object) {
+    return 'cell' in object;
+}
+function contentMatchesToTextSearchMatches(contentMatches, cell) {
+    return genericCellMatchesToTextSearchMatches(contentMatches, cell.textBuffer);
+}
+function webviewMatchesToTextSearchMatches(webviewMatches) {
+    return ( webviewMatches
+        .map(rawMatch => (rawMatch.searchPreviewInfo) ?
+        ( new TextSearchMatch(rawMatch.searchPreviewInfo.line, ( new Range(
+            0,
+            rawMatch.searchPreviewInfo.range.start,
+            0,
+            rawMatch.searchPreviewInfo.range.end
+        )), undefined, rawMatch.index)) : undefined)).filter((e) => !!e);
+}
+export { contentMatchesToTextSearchMatches, getIDFromINotebookCellMatch, isINotebookCellMatchWithModel, isINotebookFileMatchWithModel, webviewMatchesToTextSearchMatches };