@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js

@@ -60,13 +60,15 @@ let BetweenCellToolbar = class BetweenCellToolbar extends CellOverlayPart {
     }
     didRenderCell(element) {
         const betweenCellToolbar = this._initialize();
-        betweenCellToolbar.context = {
-            ui: true,
-            cell: element,
-            notebookEditor: this._notebookEditor,
-            source: 'insertToolbar',
-            $mid: MarshalledId.NotebookCellActionContext
-        };
+        if (this._notebookEditor.hasModel()) {
+            betweenCellToolbar.context = {
+                ui: true,
+                cell: element,
+                notebookEditor: this._notebookEditor,
+                source: 'insertToolbar',
+                $mid: MarshalledId.NotebookCellActionContext
+            };
+        }
         this.updateInternalLayoutNow(element);
     }
     updateInternalLayoutNow(element) {
@@ -151,13 +153,16 @@ let CellTitleToolbarPart = class CellTitleToolbarPart extends CellOverlayPart {
         const model = this._initializeModel();
         const view = this._initialize(model, element);
         this.cellDisposables.add(registerCellToolbarStickyScroll(this._notebookEditor, element, this.toolbarContainer, { extraOffset: 4, min: -14 }));
-        this.updateContext(view, {
-            ui: true,
-            cell: element,
-            notebookEditor: this._notebookEditor,
-            source: 'cellToolbar',
-            $mid: MarshalledId.NotebookCellActionContext
-        });
+        if (this._notebookEditor.hasModel()) {
+            const toolbarContext = {
+                ui: true,
+                cell: element,
+                notebookEditor: this._notebookEditor,
+                source: 'cellToolbar',
+                $mid: MarshalledId.NotebookCellActionContext
+            };
+            this.updateContext(view, toolbarContext);
+        }
     }
     updateContext(view, toolbarContext) {
         view.toolbar.context = toolbarContext;

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js

@@ -92,7 +92,7 @@ let CodeCell = class CodeCell extends Disposable {
         }));
         const executionItemElement = append(this.templateData.cellInputCollapsedContainer, $('.collapsed-execution-icon'));
         this._register(toDisposable(() => {
-            executionItemElement.parentElement?.removeChild(executionItemElement);
+            executionItemElement.remove();
         }));
         this._collapsedExecutionIcon = this._register(this.instantiationService.createInstance(CollapsedCodeCellExecutionIcon, this.notebookEditor, this.viewCell, executionItemElement));
         this.updateForCollapseState();
@@ -390,7 +390,7 @@ let CodeCell = class CodeCell extends Disposable {
             }
         }
         elements.forEach(element => {
-            element.parentElement?.removeChild(element);
+            element.remove();
         });
     }
     _updateOutputInnerContainer(hide) {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js

@@ -42,12 +42,15 @@ let RunToolbar = class RunToolbar extends CellContentPart {
     }
     didRenderCell(element) {
         this.cellDisposables.add(registerCellToolbarStickyScroll(this.notebookEditor, element, this.runButtonContainer));
-        this.toolbar.context = {
-            ui: true,
-            cell: element,
-            notebookEditor: this.notebookEditor,
-            $mid: MarshalledId.NotebookCellActionContext
-        };
+        if (this.notebookEditor.hasModel()) {
+            const context = {
+                ui: true,
+                cell: element,
+                notebookEditor: this.notebookEditor,
+                $mid: MarshalledId.NotebookCellActionContext
+            };
+            this.toolbar.context = context;
+        }
     }
     getCellToolbarActions(menu) {
         const primary = [];

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js

@@ -276,7 +276,7 @@ let MarkupCell = class MarkupCell extends Disposable {
             this.templateData.editorContainer.innerText = '';
             const editorContextKeyService = this.contextKeyService.createScoped(this.templateData.editorPart);
             EditorContextKeys.inCompositeEditor.bindTo(editorContextKeyService).set(true);
-            const editorInstaService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, editorContextKeyService]))));
+            const editorInstaService = this.editorDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, editorContextKeyService])))));
             this.editorDisposables.add(editorContextKeyService);
             this.editor = this.editorDisposables.add(editorInstaService.createInstance(CodeEditorWidget, this.templateData.editorContainer, {
                 ...this.editorOptions,

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js

@@ -182,7 +182,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             'notebook-markdown-line-height': typeof this.options.markdownLineHeight === 'number' && this.options.markdownLineHeight > 0 ? `${this.options.markdownLineHeight}px` : `normal`,
             'notebook-cell-output-font-size': `${this.options.outputFontSize || this.options.fontSize}px`,
             'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`,
-            'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit}px`,
+            'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit + 2}px`,
             'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily,
             'notebook-cell-markup-empty-content': ( localizeWithPath(_moduleId, 0, "Empty markdown cell, double-click or press enter to edit.")),
             'notebook-cell-renderer-not-found-error': ( localizeWithPath(_moduleId, 1, "No renderer found for '$0'")),
@@ -333,7 +333,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
 					}
 
 					table, thead, tr, th, td, tbody {
-						border: none !important;
+						border: none;
 						border-color: transparent;
 						border-spacing: 0;
 						border-collapse: collapse;
@@ -925,7 +925,9 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             }
         }
         if (match) {
-            match.group.openEditor(match.editor, lineNumber !== undefined && column !== undefined ? { selection: { startLineNumber: lineNumber, startColumn: column } } : undefined);
+            const selection = lineNumber !== undefined && column !== undefined ? { startLineNumber: lineNumber, startColumn: column } : undefined;
+            const textEditorOptions = { selection: selection };
+            match.group.openEditor(match.editor, selection ? textEditorOptions : undefined);
         }
         else {
             this.openerService.open(uri, { fromUserGesture: true, fromWorkspace: true });

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js

@@ -123,7 +123,7 @@ let MarkupCellRenderer = class MarkupCellRenderer extends AbstractCellRenderer {
         const cellCommentPartContainer = append(container, $('.cell-comment-container'));
         const innerContent = append(container, $('.cell.markdown'));
         const bottomCellContainer = append(container, $('.cell-bottom-toolbar-container'));
-        const scopedInstaService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService]))));
+        const scopedInstaService = templateDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService])))));
         const rootClassDelegate = {
             toggle: (className, force) => container.classList.toggle(className, force)
         };
@@ -234,7 +234,7 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
         const editorContainer = append(editorPart, $('.cell-editor-container'));
         const cellCommentPartContainer = append(container, $('.cell-comment-container'));
         const editorContextKeyService = templateDisposables.add(this.contextKeyServiceProvider(editorPart));
-        const editorInstaService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, editorContextKeyService]))));
+        const editorInstaService = templateDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, editorContextKeyService])))));
         EditorContextKeys.inCompositeEditor.bindTo(editorContextKeyService).set(true);
         const editor = editorInstaService.createInstance(CodeEditorWidget, editorContainer, {
             ...this.editorOptions.getDefaultValue(),
@@ -256,7 +256,7 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
         focusSinkElement.setAttribute('tabindex', '0');
         const bottomCellToolbarContainer = append(container, $('.cell-bottom-toolbar-container'));
         const focusIndicatorBottom = ( (new FastDomNode(append(container, $('.cell-focus-indicator.cell-focus-indicator-bottom')))));
-        const scopedInstaService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService]))));
+        const scopedInstaService = templateDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService])))));
         const rootClassDelegate = {
             toggle: (className, force) => container.classList.toggle(className, force)
         };

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js

@@ -2266,7 +2266,7 @@ async function webviewPreloads(ctx) {
                 cellId: cellId
             });
             if (this.dragOverlay) {
-                window.document.body.removeChild(this.dragOverlay);
+                this.dragOverlay.remove();
                 this.dragOverlay = undefined;
             }
             e.target.style.zIndex = '';

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js

@@ -180,7 +180,10 @@ class BaseCellViewModel extends Disposable {
         if (this._editorTransientState) {
             writeTransientState(editor.getModel(), this._editorTransientState, this._codeEditorService);
         }
-        this._textEditor?.changeDecorations((accessor) => {
+        if (this._isDisposed) {
+            return;
+        }
+        editor.changeDecorations((accessor) => {
             this._resolvedDecorations.forEach((value, key) => {
                 if (key.startsWith('_lazy_')) {
                     const ret = accessor.addDecoration(value.options.range, value.options.options);
@@ -192,7 +195,7 @@ class BaseCellViewModel extends Disposable {
                 }
             });
         });
-        this._editorListeners.push(this._textEditor.onDidChangeCursorSelection(() => { this._onDidChangeState.fire({ selectionChanged: true }); }));
+        this._editorListeners.push(editor.onDidChangeCursorSelection(() => { this._onDidChangeState.fire({ selectionChanged: true }); }));
         const inlineChatController = InlineChatController.get(this._textEditor);
         if (inlineChatController) {
             this._editorListeners.push(inlineChatController.onWillStartSession(() => {
@@ -486,12 +489,12 @@ class BaseCellViewModel extends Disposable {
     }
     cellStartFind(value, options) {
         let cellMatches = [];
+        const lineCount = this.textBuffer.getLineCount();
+        const findRange = options.findScope?.selectedTextRanges ?? [( new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1))];
         if (this.assertTextModelAttached()) {
-            cellMatches = this.textModel.findMatches(value, false, options.regex || false, options.caseSensitive || false, options.wholeWord ? options.wordSeparators || null : null, options.regex || false);
+            cellMatches = this.textModel.findMatches(value, findRange, options.regex || false, options.caseSensitive || false, options.wholeWord ? options.wordSeparators || null : null, options.regex || false);
         }
         else {
-            const lineCount = this.textBuffer.getLineCount();
-            const fullRange = ( new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1));
             const searchParams = ( new SearchParams(
                 value,
                 options.regex || false,
@@ -502,7 +505,14 @@ class BaseCellViewModel extends Disposable {
             if (!searchData) {
                 return null;
             }
-            cellMatches = this.textBuffer.findMatchesLineByLine(fullRange, searchData, options.regex || false, 1000);
+            findRange.forEach(range => {
+                cellMatches.push(...this.textBuffer.findMatchesLineByLine(( new Range(
+                    range.startLineNumber,
+                    range.startColumn,
+                    range.endLineNumber,
+                    range.endColumn
+                )), searchData, options.regex || false, 1000));
+            });
         }
         return cellMatches;
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js

@@ -1,24 +1,24 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, PauseableEmitter } from '../../../../../base/common/event.js';
 import { dispose } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/arrays.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
-import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { PrefixSumComputer } from '../../../../../editor/common/model/prefixSumComputer.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
 import { CellLayoutState, CellEditState } from '../notebookBrowser.js';
 import { CellOutputViewModel } from './cellOutputViewModel.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { INotebookService } from '../../common/notebookService.service.js';
 import { BaseCellViewModel } from './baseCellViewModel.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import '../../../../../base/common/observableInternal/derived.js';
-import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
-import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/arrays.js';
 const outputDisplayLimit = 500;
 let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
     set editorHeight(height) {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+const INotebookCellOutlineDataSourceFactory = ( createDecorator('INotebookCellOutlineDataSourceFactory'));
+export { INotebookCellOutlineDataSourceFactory };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js

@@ -14,16 +14,16 @@ import { ModelDecorationOptions } from '../../../../../editor/common/model/textM
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
+import { CellFindMatchModel } from '../contrib/find/findModel.js';
 import { CellFoldingState, CellEditState } from '../notebookBrowser.js';
+import { NotebookMetadataChangedEvent } from '../notebookViewEvents.js';
 import { NotebookCellSelectionCollection } from './cellSelectionCollection.js';
 import { CodeCellViewModel } from './codeCellViewModel.js';
 import { MarkupCellViewModel } from './markupCellViewModel.js';
-import { NotebookCellsChangeType, CellKind, SelectionStateType } from '../../common/notebookCommon.js';
-import { cellRangesToIndexes, cellIndexesToRanges, reduceCellRanges } from '../../common/notebookRange.js';
-import { NotebookMetadataChangedEvent } from '../notebookViewEvents.js';
-import { CellFindMatchModel } from '../contrib/find/findModel.js';
+import { NotebookCellsChangeType, CellKind, SelectionStateType, NotebookFindScopeType } from '../../common/notebookCommon.js';
 import { NotebookExecutionType } from '../../common/notebookExecutionStateService.js';
 import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.service.js';
+import { cellRangesToIndexes, cellIndexesToRanges, reduceCellRanges } from '../../common/notebookRange.js';
 const invalidFunc = () => { throw ( new Error(`Invalid change accessor`)); };
 class DecorationsTree {
     constructor() {
@@ -76,9 +76,6 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     get viewCells() {
         return this._viewCells;
     }
-    set viewCells(_) {
-        throw ( new Error('NotebookViewModel.viewCells is readonly'));
-    }
     get length() {
         return this._viewCells.length;
     }
@@ -151,6 +148,7 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         MODEL_ID++;
         this.id = '$notebookViewModel' + MODEL_ID;
         this._instanceId = singleLetterHash(MODEL_ID);
+        this.replView = !!this.options.inRepl;
         const compute = (changes, synchronous) => {
             const diffs = ( changes.map(splice => {
                 return [splice[0], splice[1], ( splice[2].map(cell => {
@@ -261,9 +259,10 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         this._register(this._selectionCollection.onDidChangeSelection(e => {
             this._onDidChangeSelection.fire(e);
         }));
-        this._viewCells = ( this._notebook.cells.map(cell => {
-            return createCellViewModel(this._instantiationService, this, cell, this._viewContext);
-        }));
+        const viewCellCount = this.replView ? this._notebook.cells.length - 1 : this._notebook.cells.length;
+        for (let i = 0; i < viewCellCount; i++) {
+            this._viewCells.push(createCellViewModel(this._instantiationService, this, this._notebook.cells[i], this._viewContext));
+        }
         this._viewCells.forEach(cell => {
             this._handleToViewCellMapping.set(cell.handle, cell);
         });
@@ -706,8 +705,8 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     find(value, options) {
         const matches = [];
         let findCells = [];
-        const selectedRanges = options.selectedRanges?.map(range => this.validateRange(range)).filter(range => !!range);
-        if (options.searchInRanges && selectedRanges) {
+        if (options.findScope && (options.findScope.findScopeType === NotebookFindScopeType.Cells || options.findScope.findScopeType === NotebookFindScopeType.Text)) {
+            const selectedRanges = options.findScope.selectedCellRanges?.map(range => this.validateRange(range)).filter(range => !!range) ?? [];
             const selectedIndexes = cellRangesToIndexes(selectedRanges);
             findCells = ( selectedIndexes.map(index => this._viewCells[index]));
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js

@@ -13,8 +13,7 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { foldingCollapsedIcon, foldingExpandedIcon } from '../../../../../editor/contrib/folding/browser/foldingDecorations.js';
 import { FoldingController } from '../controller/foldingController.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { INotebookCellOutlineProviderFactory } from '../viewModel/notebookOutlineProviderFactory.service.js';
-import { OutlineTarget } from '../../../../services/outline/browser/outline.js';
+import { INotebookCellOutlineDataSourceFactory } from '../viewModel/notebookOutlineDataSourceFactory.service.js';
 var NotebookStickyScroll_1;
 class NotebookStickyLine extends Disposable {
     constructor(element, foldingIcon, header, entry, notebookEditor) {
@@ -146,34 +145,34 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
             }
             else {
                 this._disposables.clear();
-                this.notebookOutlineReference?.dispose();
+                this.notebookCellOutlineReference?.dispose();
                 this.disposeCurrentStickyLines();
                 clearNode(this.domNode);
                 this.updateDisplay();
             }
         }
-        else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled && this.notebookOutlineReference?.object) {
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutlineReference?.object?.entries, this.getCurrentStickyHeight()));
+        else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled && this.notebookCellOutlineReference?.object) {
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookCellOutlineReference?.object?.entries, this.getCurrentStickyHeight()));
         }
     }
     init() {
-        const { object: notebookOutlineReference } = this.notebookOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(this.notebookEditor, OutlineTarget.OutlinePane));
-        this._register(this.notebookOutlineReference);
-        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
-        this._disposables.add(notebookOutlineReference.onDidChange(() => {
-            const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
+        const { object: notebookCellOutline } = this.notebookCellOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineDataSourceFactory).getOrCreate(this.notebookEditor));
+        this._register(this.notebookCellOutlineReference);
+        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
+        this._disposables.add(notebookCellOutline.onDidChange(() => {
+            const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
             if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                 this.updateContent(recompute);
             }
         }));
         this._disposables.add(this.notebookEditor.onDidAttachViewModel(() => {
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight()));
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
         }));
         this._disposables.add(this.notebookEditor.onDidScroll(() => {
             const d = ( new Delayer(100));
             d.trigger(() => {
                 d.dispose();
-                const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookOutlineReference.entries, this.getCurrentStickyHeight());
+                const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
                 if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                     this.updateContent(recompute);
                 }
@@ -297,7 +296,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
     dispose() {
         this._disposables.dispose();
         this.disposeCurrentStickyLines();
-        this.notebookOutlineReference?.dispose();
+        this.notebookCellOutlineReference?.dispose();
         super.dispose();
     }
 };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js

@@ -305,7 +305,7 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
                 this._renderLabel = this._convertConfiguration(this.configurationService.getValue(NotebookSetting.globalToolbarShowLabel));
                 this._updateStrategy();
                 const oldElement = this._notebookLeftToolbar.getElement();
-                oldElement.parentElement?.removeChild(oldElement);
+                oldElement.remove();
                 this._notebookLeftToolbar.dispose();
                 this._notebookLeftToolbar = this.instantiationService.createInstance(WorkbenchToolBar, this._notebookTopLeftToolbarContainer, leftToolbarOptions);
                 this._register(this._notebookLeftToolbar);

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.js

@@ -89,9 +89,11 @@ let ListTopCellToolbar = class ListTopCellToolbar extends Disposable {
                 },
                 hiddenItemStrategy: HiddenItemStrategy.Ignore,
             });
-            toolbar.context = {
-                notebookEditor: this.notebookEditor
-            };
+            if (this.notebookEditor.hasModel()) {
+                toolbar.context = {
+                    notebookEditor: this.notebookEditor
+                };
+            }
             this.viewZone.value?.add(toolbar);
             this.viewZone.value?.add(this.notebookEditor.onDidChangeModel(() => {
                 this._modelDisposables.clear();

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

@@ -10,6 +10,8 @@ import { generate, parse } from '../../../services/notebook/common/notebookDocum
 const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
 const INTERACTIVE_WINDOW_EDITOR_ID = 'workbench.editor.interactive';
+const REPL_EDITOR_ID = 'workbench.editor.repl';
+const EXECUTE_REPL_COMMAND_ID = 'replNotebook.input.execute';
 var CellKind;
 ( (function(CellKind) {
     CellKind[CellKind["Markup"] = 1] = "Markup";
@@ -251,6 +253,12 @@ var NotebookEditorPriority;
     NotebookEditorPriority["default"] = "default";
     NotebookEditorPriority["option"] = "option";
 })(NotebookEditorPriority || (NotebookEditorPriority = {})));
+var NotebookFindScopeType;
+( (function(NotebookFindScopeType) {
+    NotebookFindScopeType["Cells"] = "cells";
+    NotebookFindScopeType["Text"] = "text";
+    NotebookFindScopeType["None"] = "none";
+})(NotebookFindScopeType || (NotebookFindScopeType = {})));
 function isDocumentExcludePattern(filenamePattern) {
     const arg = filenamePattern;
     if ((typeof arg.include === 'string' || isRelativePattern(arg.include))
@@ -302,7 +310,6 @@ const NotebookSetting = {
     outputFontFamilyDeprecated: 'notebook.outputFontFamily',
     outputFontFamily: 'notebook.output.fontFamily',
     findFilters: 'notebook.find.filters',
-    findScope: 'notebook.experimental.find.scope.enabled',
     logging: 'notebook.logging',
     confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
     remoteSaving: 'notebook.experimental.remoteSave',
@@ -404,4 +411,4 @@ function formatStreamText(buffer) {
     }
     return VSBuffer.fromString(fixCarriageReturn(fixBackspace(textDecoder.decode(buffer.buffer))));
 }
-export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookRendererMatch, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };
+export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, EXECUTE_REPL_COMMAND_ID, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookRendererMatch, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, REPL_EDITOR_ID, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };