@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -41,15 +41,15 @@ import { Themable } from '../../../../../../platform/theme/common/themeService.j
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.service.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.service.js';
 import { IWorkspaceTrustManagementService } from '../../../../../../platform/workspace/common/workspaceTrust.service.js';
-import { CellEditState } from '../../notebookBrowser.js';
+import { CellEditState, RenderOutputType } from '../../notebookBrowser.js';
 import { NOTEBOOK_WEBVIEW_BOUNDARY } from '../notebookCellList.js';
 import { preloadsScriptStr } from './webviewPreloads.js';
 import { transformWebviewThemeVars } from './webviewThemeMapping.js';
 import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
-import { CellUri } from '../../../common/notebookCommon.js';
+import { RendererMessagingSpec, CellUri } from '../../../common/notebookCommon.js';
 import { INotebookLoggingService } from '../../../common/notebookLoggingService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
-import { WebviewOriginStore } from '../../../../webview/browser/webview.js';
+import { WebviewOriginStore, WebviewContentPurpose } from '../../../../webview/browser/webview.js';
 import { IWebviewService } from '../../../../webview/browser/webview.service.js';
 import { WebviewWindowDragMonitor } from '../../../../webview/browser/webviewWindowDragMonitor.js';
 import { webviewGenericCspSource, asWebviewUri } from '../../../../webview/common/webview.js';
@@ -179,6 +179,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             'notebook-output-node-left-padding': `${this.options.outputNodeLeftPadding}px`,
             'notebook-markdown-min-height': `${this.options.previewNodePadding * 2}px`,
             'notebook-markup-font-size': typeof this.options.markupFontSize === 'number' && this.options.markupFontSize > 0 ? `${this.options.markupFontSize}px` : `calc(${this.options.fontSize}px * 1.2)`,
+            '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`,
@@ -264,6 +265,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
 						white-space: initial;
 
 						font-size: var(--notebook-markup-font-size);
+						line-height: var(--notebook-markdown-line-height);
 						color: var(--theme-ui-foreground);
 					}
 
@@ -296,6 +298,14 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
 						background-color: var(--theme-notebook-symbol-highlight-background);
 					}
 
+					#container .markup > div.nb-multiCellHighlight {
+						background-color: var(--theme-notebook-symbol-highlight-background);
+					}
+
+					#container .nb-multiCellHighlight .output_container .output {
+						background-color: var(--theme-notebook-symbol-highlight-background);
+					}
+
 					#container .nb-chatGenerationHighlight .output_container .output {
 						background-color: var(--vscode-notebook-selectedCellBackground);
 					}
@@ -384,7 +394,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                     id: renderer.id,
                     entrypoint,
                     mimeTypes: renderer.mimeTypes,
-                    messaging: renderer.messaging !== "never" ,
+                    messaging: renderer.messaging !== RendererMessagingSpec.Never,
                     isBuiltin: renderer.isBuiltin
                 };
             }))
@@ -976,7 +986,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             origin: BackLayerWebView_1.getOriginStore(this.storageService).getOrigin(this.notebookViewType, undefined),
             title: ( localizeWithPath(_moduleId, 3, "Notebook webview content")),
             options: {
-                purpose: "notebookRenderer" ,
+                purpose: WebviewContentPurpose.NotebookRenderer,
                 enableFindWidget: false,
                 transformCssVariables: transformWebviewThemeVars,
             },
@@ -1209,7 +1219,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         return this.initializeMarkupPromise.p.p;
     }
     _cachedInsetEqual(cachedInset, content) {
-        if (content.type === 1 ) {
+        if (content.type === RenderOutputType.Extension) {
             return cachedInset.renderer?.id === content.renderer.id;
         }
         else {
@@ -1289,7 +1299,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         const transfer = [];
         let message;
         let renderer;
-        if (content.type === 1 ) {
+        if (content.type === RenderOutputType.Extension) {
             const output = content.source.model;
             renderer = content.renderer;
             const first = output.outputs.find(op => op.mime === content.mimeType);
@@ -1300,7 +1310,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                 outputId: output.outputId,
                 rendererId: content.renderer.id,
                 content: {
-                    type: 1 ,
+                    type: RenderOutputType.Extension,
                     outputId: output.outputId,
                     metadata: metadata,
                     output: {
@@ -1344,14 +1354,14 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         this.hiddenInsetMapping.delete(content.source);
         let updatedContent = undefined;
         const transfer = [];
-        if (content.type === 1 ) {
+        if (content.type === RenderOutputType.Extension) {
             const output = content.source.model;
             const firstBuffer = output.outputs.find(op => op.mime === content.mimeType);
             const appenededData = output.appendedSinceVersion(outputCache.versionId, content.mimeType);
             const appended = appenededData ? { valueBytes: appenededData.buffer, previousVersion: outputCache.versionId } : undefined;
             const valueBytes = copyBufferIfNeeded(firstBuffer.data.buffer, transfer);
             updatedContent = {
-                type: 1 ,
+                type: RenderOutputType.Extension,
                 outputId: outputCache.outputId,
                 metadata: output.metadata,
                 output: {

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

@@ -945,7 +945,7 @@ async function webviewPreloads(ctx) {
     }
     const find = (query, options) => {
         let find = true;
-        const matches = [];
+        let matches = [];
         const range = document.createRange();
         range.selectNodeContents(window.document.getElementById('findStart'));
         const sel = window.getSelection();
@@ -1050,6 +1050,7 @@ async function webviewPreloads(ctx) {
         catch (e) {
             console.log(e);
         }
+        matches = matches.filter(match => options.findIds.length ? options.findIds.includes(match.cellId) : true);
         _highlighter.addHighlights(matches, options.ownerID);
         window.document.getSelection()?.removeAllRanges();
         viewModel.toggleDragDropEnabled(currentOptions.dragAndDropEnabled);

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

@@ -3,6 +3,7 @@ import { Disposable, MutableDisposable, dispose } from '../../../../../base/comm
 import { Mimes } from '../../../../../base/common/mime.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { Selection } from '../../../../../editor/common/core/selection.js';
+import { ScrollType } from '../../../../../editor/common/editorCommon.js';
 import { SearchParams } from '../../../../../editor/common/model/textModelSearch.js';
 import { writeTransientState, readTransientState } from '../../../codeEditor/browser/toggleWordWrap.js';
 import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
@@ -360,7 +361,7 @@ class BaseCellViewModel extends Disposable {
         return Array.from(( this._cellStatusBarItems.values()));
     }
     revealRangeInCenter(range) {
-        this._textEditor?.revealRangeInCenter(range, 1 );
+        this._textEditor?.revealRangeInCenter(range, ScrollType.Immediate);
     }
     setSelection(range) {
         this._textEditor?.setSelection(range);

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

@@ -12,13 +12,15 @@ import { CellOutputViewModel } from './cellOutputViewModel.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { INotebookService } from '../../common/notebookService.service.js';
 import { BaseCellViewModel } from './baseCellViewModel.js';
-import { CellDiagnostics } from '../contrib/cellDiagnostics/cellDiagnostics.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 {
-    get cellDiagnostics() {
-        return this._cellDiagnostics;
-    }
     set editorHeight(height) {
         if (this._editorHeight === height) {
             return;
@@ -104,6 +106,7 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
         this._focusOnOutput = false;
         this._focusInputInOutput = false;
         this._outputMinHeight = 0;
+        this.excecutionError = observableValue('excecutionError', undefined);
         this._hasFindResult = this._register(( new Emitter()));
         this.hasFindResult = this._hasFindResult.event;
         this._outputViewModels = ( this.model.outputs.map(output => ( new CellOutputViewModel(this, output, this._notebookService))));
@@ -123,14 +126,9 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
             if (outputLayoutChange) {
                 this.layoutChange({ outputHeight: true }, 'CodeCellViewModel#model.onDidChangeOutputs');
             }
-            if (this._outputCollection.length === 0) {
-                this._cellDiagnostics.clear();
-            }
             dispose(removedOutputs);
         }));
         this._outputCollection = ( new Array(this.model.outputs.length));
-        this._cellDiagnostics = instantiationService.createInstance(CellDiagnostics, this);
-        this._register(this._cellDiagnostics);
         this._layoutInfo = {
             fontInfo: initialNotebookLayoutInfo?.fontInfo || null,
             editorHeight: 0,
@@ -367,7 +365,6 @@ let CodeCellViewModel = class CodeCellViewModel extends BaseCellViewModel {
             this.updateEditState(CellEditState.Editing, 'onDidChangeTextModelContent');
             this._onDidChangeState.fire({ contentChanged: true });
         }
-        this._cellDiagnostics.clear();
     }
     onDeselect() {
         this.updateEditState(CellEditState.Preview, 'onDeselect');

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

@@ -2,6 +2,7 @@ import { renderMarkdownAsPlaintext } from '../../../../../base/browser/markdownR
 import { Emitter } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import marked_1 from '../../../../../../../../external/vscode-marked/lib/marked.esm.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
 import { FoldingRegions } from '../../../../../editor/contrib/folding/browser/foldingRanges.js';
 import { sanitizeRanges } from '../../../../../editor/contrib/folding/browser/syntaxRangeProvider.js';
 import { CellKind } from '../../common/notebookCommon.js';
@@ -194,9 +195,9 @@ class FoldingModel {
             const region = newRegions.toRegion(i);
             cellRanges.push({ start: region.startLineNumber - 1, end: region.endLineNumber - 1 });
         }
-        this._foldingRangeDecorationIds.forEach(id => viewModel.setTrackedRange(id, null, 3 ));
+        this._foldingRangeDecorationIds.forEach(id => viewModel.setTrackedRange(id, null, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter));
         this._foldingRangeDecorationIds = ( cellRanges.map(
-            region => viewModel.setTrackedRange(null, region, 3 )
+            region => viewModel.setTrackedRange(null, region, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter)
         )).filter(str => str !== null);
         this._regions = newRegions;
         this._onDidFoldingRegionChanges.fire();

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Emitter } from '../../../../../base/common/event.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { CellLayoutState, CellLayoutContext, CellEditState } from '../notebookBrowser.js';
+import { CellLayoutState, CellLayoutContext, CellEditState, CellFoldingState } from '../notebookBrowser.js';
 import { BaseCellViewModel } from './baseCellViewModel.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
@@ -121,7 +121,7 @@ let MarkupCellViewModel = class MarkupCellViewModel extends BaseCellViewModel {
         }
     }
     _computeFoldHintHeight() {
-        return ((this.getEditState() === CellEditState.Editing || this.foldingState !== 2) ) ?
+        return (this.getEditState() === CellEditState.Editing || this.foldingState !== CellFoldingState.Collapsed) ?
             0 : this.viewContext.notebookOptions.getLayoutConfiguration().markdownFoldHintHeight;
     }
     updateOptions(e) {

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

@@ -7,13 +7,14 @@ import { clamp } from '../../../../../base/common/numbers.js';
 import { singleLetterHash } from '../../../../../base/common/strings.js';
 import { ResourceTextEdit, IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+import { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
 import { SingleModelEditStackElement, MultiModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
 import { IntervalNode, IntervalTree } from '../../../../../editor/common/model/intervalTree.js';
 import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
 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 { CellEditState } from '../notebookBrowser.js';
+import { CellFoldingState, CellEditState } from '../notebookBrowser.js';
 import { NotebookCellSelectionCollection } from './cellSelectionCollection.js';
 import { CodeCellViewModel } from './codeCellViewModel.js';
 import { MarkupCellViewModel } from './markupCellViewModel.js';
@@ -57,10 +58,10 @@ class DecorationsTree {
     }
 }
 const TRACKED_RANGE_OPTIONS = [
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-always-grows-when-typing-at-edges', stickiness: 0  }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-never-grows-when-typing-at-edges', stickiness: 1  }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-before', stickiness: 2  }),
-    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-after', stickiness: 3  }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-always-grows-when-typing-at-edges', stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-never-grows-when-typing-at-edges', stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-before', stickiness: TrackedRangeStickiness.GrowsOnlyWhenTypingBefore }),
+    ModelDecorationOptions.register({ description: 'notebook-view-model-tracked-range-grows-only-when-typing-after', stickiness: TrackedRangeStickiness.GrowsOnlyWhenTypingAfter }),
 ];
 function _normalizeOptions(options) {
     if (options instanceof ModelDecorationOptions) {
@@ -322,14 +323,14 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     }
     getFoldingState(index) {
         if (!this._foldingRanges) {
-            return 0 ;
+            return CellFoldingState.None;
         }
         const range = this._foldingRanges.findRange(index + 1);
         const startIndex = this._foldingRanges.getStartLineNumber(range) - 1;
         if (startIndex !== index) {
-            return 0 ;
+            return CellFoldingState.None;
         }
-        return this._foldingRanges.isCollapsed(range) ? 2  : 1 ;
+        return this._foldingRanges.isCollapsed(range) ? CellFoldingState.Collapsed : CellFoldingState.Expanded;
     }
     getFoldedLength(index) {
         if (!this._foldingRanges) {
@@ -704,7 +705,16 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
     }
     find(value, options) {
         const matches = [];
-        this._viewCells.forEach((cell, index) => {
+        let findCells = [];
+        const selectedRanges = options.selectedRanges?.map(range => this.validateRange(range)).filter(range => !!range);
+        if (options.searchInRanges && selectedRanges) {
+            const selectedIndexes = cellRangesToIndexes(selectedRanges);
+            findCells = ( selectedIndexes.map(index => this._viewCells[index]));
+        }
+        else {
+            findCells = this._viewCells;
+        }
+        findCells.forEach((cell, index) => {
             const cellMatches = cell.startFind(value, options);
             if (cellMatches) {
                 matches.push(( new CellFindMatchModel(cellMatches.cell, index, cellMatches.contentMatches, [])));

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

@@ -6,6 +6,7 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
+import { CellFoldingState } from '../notebookBrowser.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { Delayer } from '../../../../../base/common/async.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -13,6 +14,7 @@ import { foldingCollapsedIcon, foldingExpandedIcon } from '../../../../../editor
 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';
 var NotebookStickyScroll_1;
 class NotebookStickyLine extends Disposable {
     constructor(element, foldingIcon, header, entry, notebookEditor) {
@@ -36,7 +38,7 @@ class NotebookStickyLine extends Disposable {
         const foldingController = this.notebookEditor.getContribution(FoldingController.id);
         const index = this.entry.index;
         const headerLevel = this.entry.level;
-        const newFoldingState = ((currentState === 2) ) ? 1  : 2 ;
+        const newFoldingState = (currentState === CellFoldingState.Collapsed) ? CellFoldingState.Expanded : CellFoldingState.Collapsed;
         foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
         this.focusCell();
     }
@@ -155,7 +157,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         }
     }
     init() {
-        const { object: notebookOutlineReference } = this.notebookOutlineReference = this.instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(this.notebookEditor, 1 ));
+        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(() => {
@@ -276,7 +278,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         }
         let isCollapsed = false;
         if (entry.cell.cellKind === CellKind.Markup) {
-            isCollapsed = entry.cell.foldingState === 2 ;
+            isCollapsed = entry.cell.foldingState === CellFoldingState.Collapsed;
         }
         const stickyFoldingIcon = ( new StickyFoldingIcon(isCollapsed, 16));
         stickyFoldingIcon.domNode.classList.add('notebook-sticky-scroll-folding-icon');

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

@@ -5,6 +5,7 @@ import { ToolBar } from '../../../../../base/browser/ui/toolbar/toolbar.js';
 import { Separator } from '../../../../../base/common/actions.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
 import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId, MenuItemAction, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
@@ -19,7 +20,7 @@ import { ActionViewWithLabel, UnifiedSubmenuActionView } from '../view/cellParts
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.service.js';
 import { disposableTimeout } from '../../../../../base/common/async.js';
-import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { WorkbenchToolBar, HiddenItemStrategy } from '../../../../../platform/actions/browser/toolbar.js';
 import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 var RenderLabel;
 ( (function(RenderLabel) {
@@ -200,8 +201,8 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         this._notebookTopLeftToolbarContainer = document.createElement('div');
         this._notebookTopLeftToolbarContainer.classList.add('notebook-toolbar-left');
         this._leftToolbarScrollable = ( new DomScrollableElement(this._notebookTopLeftToolbarContainer, {
-            vertical: 2 ,
-            horizontal: 3 ,
+            vertical: ScrollbarVisibility.Hidden,
+            horizontal: ScrollbarVisibility.Visible,
             horizontalScrollbarSize: 3,
             useShadows: false,
             scrollYToX: true
@@ -252,7 +253,7 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         const hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {}));
         hoverDelegate.setInstantHoverTimeLimit(600);
         const leftToolbarOptions = {
-            hiddenItemStrategy: 1 ,
+            hiddenItemStrategy: HiddenItemStrategy.RenderInSecondaryGroup,
             resetMenu: MenuId.NotebookToolbar,
             actionViewItemProvider: (action, options) => {
                 return this._strategy.actionProvider(action, options);

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

@@ -5,14 +5,17 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { uppercaseFirstLetter } from '../../../../../base/common/strings.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { IProductService } from '../../../../../platform/product/common/productService.service.js';
+import { ProgressLocation } from '../../../../../platform/progress/common/progress.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ViewContainerLocation } from '../../../../common/views.js';
 import { VIEWLET_ID } from '../../../extensions/common/extensions.js';
 import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.service.js';
 import { JUPYTER_EXTENSION_ID, KERNEL_RECOMMENDATIONS } from '../notebookBrowser.js';
@@ -23,6 +26,7 @@ import { IPaneCompositePartService } from '../../../../services/panecomposite/br
 import { URI } from '../../../../../base/common/uri.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
+import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
 const _moduleId = "vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy";
 function isKernelPick(item) {
     return 'kernel' in item;
@@ -203,7 +207,7 @@ class KernelPickerStrategyBase {
         const extensionsToEnable = [];
         for (const extId of extIds) {
             const extension = (await extensionWorkbenchService.getExtensions([{ id: extId }], CancellationToken.None))[0];
-            if (extension.enablementState === 6  || extension.enablementState === 7  || extension.enablementState === 2 ) {
+            if (extension.enablementState === EnablementState.DisabledGlobally || extension.enablementState === EnablementState.DisabledWorkspace || extension.enablementState === EnablementState.DisabledByEnvironment) {
                 extensionsToEnable.push(extension);
             }
             else {
@@ -218,24 +222,24 @@ class KernelPickerStrategyBase {
                     await extensionWorkbenchService.install(extension, {
                         installPreReleaseVersion: isInsiders ?? false,
                         context: { skipWalkthrough: true }
-                    }, 15 );
+                    }, ProgressLocation.Notification);
                 }))), ...( (extensionsToEnable.map(async (extension) => {
                     switch (extension.enablementState) {
-                        case 7 :
-                            await extensionWorkbenchService.setEnablement([extension], 9 );
+                        case EnablementState.DisabledWorkspace:
+                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledWorkspace);
                             return;
-                        case 6 :
-                            await extensionWorkbenchService.setEnablement([extension], 8 );
+                        case EnablementState.DisabledGlobally:
+                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledGlobally);
                             return;
-                        case 2 :
-                            await extensionWorkbenchService.setEnablement([extension], 3 );
+                        case EnablementState.DisabledByEnvironment:
+                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledByEnvironment);
                             return;
                     }
                 })))]);
             await extensionService.activateByEvent(`onNotebook:${viewType}`);
             return;
         }
-        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, 0 , true);
+        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
         const view = viewlet?.getViewPaneContainer();
         const pascalCased = ( (viewType.split(/[^a-z0-9]/ig).map(uppercaseFirstLetter))).join('');
         view?.search(`@tag:notebookKernel${pascalCased}`);
@@ -257,7 +261,7 @@ class KernelPickerStrategyBase {
         const suggestedExtension = language ? this.getSuggestedKernelFromLanguage(notebookTextModel.viewType, language) : undefined;
         if (suggestedExtension) {
             await extensionWorkbenchService.queryLocal();
-            const extensions = extensionWorkbenchService.installed.filter(e => ((e.enablementState === 3  || e.enablementState === 8  || e.enablementState === 9) )
+            const extensions = extensionWorkbenchService.installed.filter(e => (e.enablementState === EnablementState.EnabledByEnvironment || e.enablementState === EnablementState.EnabledGlobally || e.enablementState === EnablementState.EnabledWorkspace)
                 && suggestedExtension.extensionIds.includes(e.identifier.id));
             if (extensions.length === suggestedExtension.extensionIds.length) {
                 return undefined;
@@ -518,7 +522,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         if (typeof command === 'string' || !command.arguments || !Array.isArray(command.arguments) || command.arguments.length === 0) {
             args.unshift({
                 uri: notebook.uri,
-                $mid: 14
+                $mid: MarshalledId.NotebookActionContext
             });
         }
         if (typeof command === 'string') {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { $, clearNode } from '../../../../../base/browser/dom.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../../platform/actions/browser/toolbar.js';
 import { MenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
@@ -87,7 +87,7 @@ let ListTopCellToolbar = class ListTopCellToolbar extends Disposable {
                 toolbarOptions: {
                     primaryGroup: (g) => /^inline/.test(g),
                 },
-                hiddenItemStrategy: 0 ,
+                hiddenItemStrategy: HiddenItemStrategy.Ignore,
             });
             toolbar.context = {
                 notebookEditor: this.notebookEditor

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js

@@ -3,6 +3,7 @@ import { hash, StringSHA1 } from '../../../../../base/common/hash.js';
 import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+import { DefaultEndOfLine, EndOfLinePreference } from '../../../../../editor/common/model.js';
 import { PieceTreeTextBuffer } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js';
 import { PieceTreeTextBufferBuilder } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
@@ -63,7 +64,7 @@ class NotebookCellTextModel extends Disposable {
         const builder = ( new PieceTreeTextBufferBuilder());
         builder.acceptChunk(this._source);
         const bufferFactory = builder.finish(true);
-        const { textBuffer, disposable } = bufferFactory.create(1 );
+        const { textBuffer, disposable } = bufferFactory.create(DefaultEndOfLine.LF);
         this._textBuffer = textBuffer;
         this._register(disposable);
         this._register(this._textBuffer.onDidChangeContent(() => {
@@ -198,10 +199,10 @@ class NotebookCellTextModel extends Disposable {
         const fullRange = this.getFullModelRange();
         const eol = this.textBuffer.getEOL();
         if (eol === '\n') {
-            return this.textBuffer.getValueInRange(fullRange, 1 );
+            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
         }
         else {
-            return this.textBuffer.getValueInRange(fullRange, 2 );
+            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.CRLF);
         }
     }
     getTextBufferHash() {

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

@@ -53,6 +53,19 @@ var NotebookExecutionState;
     NotebookExecutionState[NotebookExecutionState["Pending"] = 2] = "Pending";
     NotebookExecutionState[NotebookExecutionState["Executing"] = 3] = "Executing";
 })(NotebookExecutionState || (NotebookExecutionState = {})));
+var NotebookRendererMatch;
+( (function(NotebookRendererMatch) {
+    NotebookRendererMatch[NotebookRendererMatch["WithHardKernelDependency"] = 0] = "WithHardKernelDependency";
+    NotebookRendererMatch[NotebookRendererMatch["WithOptionalKernelDependency"] = 1] = "WithOptionalKernelDependency";
+    NotebookRendererMatch[NotebookRendererMatch["Pure"] = 2] = "Pure";
+    NotebookRendererMatch[NotebookRendererMatch["Never"] = 3] = "Never";
+})(NotebookRendererMatch || (NotebookRendererMatch = {})));
+var RendererMessagingSpec;
+( (function(RendererMessagingSpec) {
+    RendererMessagingSpec["Always"] = "always";
+    RendererMessagingSpec["Never"] = "never";
+    RendererMessagingSpec["Optional"] = "optional";
+})(RendererMessagingSpec || (RendererMessagingSpec = {})));
 var NotebookCellsChangeType;
 ( (function(NotebookCellsChangeType) {
     NotebookCellsChangeType[NotebookCellsChangeType["ModelChange"] = 1] = "ModelChange";
@@ -73,6 +86,18 @@ var SelectionStateType;
     SelectionStateType[SelectionStateType["Handle"] = 0] = "Handle";
     SelectionStateType[SelectionStateType["Index"] = 1] = "Index";
 })(SelectionStateType || (SelectionStateType = {})));
+var CellEditType;
+( (function(CellEditType) {
+    CellEditType[CellEditType["Replace"] = 1] = "Replace";
+    CellEditType[CellEditType["Output"] = 2] = "Output";
+    CellEditType[CellEditType["Metadata"] = 3] = "Metadata";
+    CellEditType[CellEditType["CellLanguage"] = 4] = "CellLanguage";
+    CellEditType[CellEditType["DocumentMetadata"] = 5] = "DocumentMetadata";
+    CellEditType[CellEditType["Move"] = 6] = "Move";
+    CellEditType[CellEditType["OutputItems"] = 7] = "OutputItems";
+    CellEditType[CellEditType["PartialMetadata"] = 8] = "PartialMetadata";
+    CellEditType[CellEditType["PartialInternalMetadata"] = 9] = "PartialInternalMetadata";
+})(CellEditType || (CellEditType = {})));
 var CellUri;
 ( (function(CellUri) {
     CellUri.scheme = Schemas.vscodeNotebookCell;
@@ -257,6 +282,7 @@ const NotebookSetting = {
     openGettingStarted: 'notebook.experimental.openGettingStarted',
     globalToolbarShowLabel: 'notebook.globalToolbarShowLabel',
     markupFontSize: 'notebook.markup.fontSize',
+    markdownLineHeight: 'notebook.markdown.lineHeight',
     interactiveWindowCollapseCodeCells: 'interactiveWindow.collapseCellInputCode',
     outputScrollingDeprecated: 'notebook.experimental.outputScrolling',
     outputScrolling: 'notebook.output.scrolling',
@@ -265,6 +291,7 @@ const NotebookSetting = {
     minimalErrorRendering: 'notebook.output.minimalErrorRendering',
     formatOnSave: 'notebook.formatOnSave.enabled',
     insertFinalNewline: 'notebook.insertFinalNewline',
+    defaultFormatter: 'notebook.defaultFormatter',
     formatOnCellExecution: 'notebook.formatOnCellExecution',
     codeActionsOnSave: 'notebook.codeActionsOnSave',
     outputWordWrap: 'notebook.output.wordWrap',
@@ -274,7 +301,8 @@ const NotebookSetting = {
     outputFontSize: 'notebook.output.fontSize',
     outputFontFamilyDeprecated: 'notebook.outputFontFamily',
     outputFontFamily: 'notebook.output.fontFamily',
-    findScope: 'notebook.find.scope',
+    findFilters: 'notebook.find.filters',
+    findScope: 'notebook.experimental.find.scope.enabled',
     logging: 'notebook.logging',
     confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
     remoteSaving: 'notebook.experimental.remoteSave',
@@ -291,6 +319,11 @@ const NotebookSetting = {
     cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
     outputBackupSizeLimit: 'notebook.backup.sizeLimit',
 };
+var CellStatusbarAlignment;
+( (function(CellStatusbarAlignment) {
+    CellStatusbarAlignment[CellStatusbarAlignment["Left"] = 1] = "Left";
+    CellStatusbarAlignment[CellStatusbarAlignment["Right"] = 2] = "Right";
+})(CellStatusbarAlignment || (CellStatusbarAlignment = {})));
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }
     static create(viewType) {
@@ -371,4 +404,4 @@ function formatStreamText(buffer) {
     }
     return VSBuffer.fromString(fixCarriageReturn(fixBackspace(textDecoder.decode(buffer.buffer))));
 }
-export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellKind, 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, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };
+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 };