@codingame/monaco-vscode-notebook-service-override 2.0.3 → 2.1.0

package/notebook.js

@@ -25,6 +25,7 @@ import { NotebookLoggingService } from './vscode/src/vs/workbench/contrib/notebo
 import { INotebookSearchService } from 'vscode/vscode/vs/workbench/contrib/search/common/notebookSearch';
 import { NotebookSearchService } from './vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js';
 import './vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js';
+import { INotebookDocumentService, NotebookDocumentWorkbenchService } from 'vscode/vscode/vs/workbench/services/notebook/common/notebookDocumentService';
 
 function getServiceOverride() {
     return {
@@ -40,7 +41,8 @@ function getServiceOverride() {
         [( INotebookRendererMessagingService.toString())]: new SyncDescriptor(NotebookRendererMessagingService, [], true),
         [( INotebookKeymapService.toString())]: new SyncDescriptor(NotebookKeymapService, [], true),
         [( INotebookLoggingService.toString())]: new SyncDescriptor(NotebookLoggingService, [], true),
-        [( INotebookSearchService.toString())]: new SyncDescriptor(NotebookSearchService, [], true)
+        [( INotebookSearchService.toString())]: new SyncDescriptor(NotebookSearchService, [], true),
+        [( INotebookDocumentService.toString())]: new SyncDescriptor(NotebookDocumentWorkbenchService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2"
   },
   "exports": {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -14,7 +14,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { renderFormattedText } from 'vscode/vscode/vs/base/browser/formattedTextRenderer';
 import { ApplyFileSnippetAction } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
-import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
@@ -58,6 +58,8 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         this.toDispose = [];
         this.toDispose.push(this.editor.onDidChangeModel(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeModelLanguage(() => this.update()));
+        this.toDispose.push(this.editor.onDidChangeModelContent(() => this.update()));
+        this.toDispose.push(this.inlineChatService.onDidChangeProviders(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeModelDecorations(() => this.update()));
         this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(emptyTextEditorHintSetting)) {
@@ -69,8 +71,8 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
                 this.textHintContentWidget?.dispose();
             }
         }));
-        this.toDispose.push(inlineChatSessionService.onDidEndSession(editor => {
-            if (this.editor === editor) {
+        this.toDispose.push(inlineChatSessionService.onDidEndSession(e => {
+            if (this.editor === e.editor) {
                 this.update();
             }
         }));
@@ -94,13 +96,23 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         if (this.inlineChatSessionService.getSession(this.editor, model.uri)) {
             return false;
         }
+        if (this.editor.getModel()?.getValueLength()) {
+            return false;
+        }
+        const hasConflictingDecorations = Boolean(this.editor.getLineDecorations(1)?.find((d) => d.options.beforeContentClassName
+            || d.options.afterContentClassName
+            || d.options.before?.content
+            || d.options.after?.content));
+        if (hasConflictingDecorations) {
+            return false;
+        }
         const inlineChatProviders = [...this.inlineChatService.getAllProvider()];
         const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && !inlineChatProviders.length;
         return inlineChatProviders.length > 0 || shouldRenderDefaultHint;
     }
     update() {
-        this.textHintContentWidget?.dispose();
-        if (this._shouldRenderHint()) {
+        const shouldRenderHint = this._shouldRenderHint();
+        if (shouldRenderHint && !this.textHintContentWidget) {
             this.textHintContentWidget = ( new EmptyTextEditorHintContentWidget(
                 this.editor,
                 this._getOptions(),
@@ -113,6 +125,10 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
                 this.productService
             ));
         }
+        else if (!shouldRenderHint && this.textHintContentWidget) {
+            this.textHintContentWidget.dispose();
+            this.textHintContentWidget = undefined;
+        }
     }
     dispose() {
         dispose(this.toDispose);
@@ -144,8 +160,6 @@ class EmptyTextEditorHintContentWidget {
         this.isVisible = false;
         this.ariaLabel = '';
         this.toDispose = ( new DisposableStore());
-        this.toDispose.add(this.inlineChatService.onDidChangeProviders(() => this.onDidChangeModelContent()));
-        this.toDispose.add(this.editor.onDidChangeModelContent(() => this.onDidChangeModelContent()));
         this.toDispose.add(this.editor.onDidChangeConfiguration((e) => {
             if (this.domNode && e.hasChanged(50 )) {
                 this.editor.applyFontInfo(this.domNode);
@@ -157,24 +171,7 @@ class EmptyTextEditorHintContentWidget {
                 status(this.ariaLabel);
             }
         }));
-        this.onDidChangeModelContent();
-    }
-    onDidChangeModelContent() {
-        if (!this.editor.getModel()?.getValueLength() && !this.hasConflictingDecorations()) {
-            this.editor.addContentWidget(this);
-            this.isVisible = true;
-        }
-        else {
-            this.editor.removeContentWidget(this);
-            this.isVisible = false;
-        }
-    }
-    hasConflictingDecorations() {
-        const res = Boolean(this.editor.getLineDecorations(1)?.find((d) => d.options.beforeContentClassName
-            || d.options.afterContentClassName
-            || d.options.before?.content
-            || d.options.after?.content));
-        return res;
+        this.editor.addContentWidget(this);
     }
     getId() {
         return EmptyTextEditorHintContentWidget.ID;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -21,7 +21,7 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
-import { getWindow, getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, getActiveElement, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
 
 let _logging = false;
 function toggleLogging() {
@@ -272,7 +272,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
     runCopyAction(accessor) {
         const loggerService = accessor.get(ILogService);
         const activeElement = getActiveElement();
-        if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+        if (activeElement instanceof HTMLElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
             _log(loggerService, '[NotebookEditor] focus is on input or textarea element, bypass');
             return false;
         }
@@ -281,6 +281,10 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
             _log(loggerService, '[NotebookEditor] no active notebook editor, bypass');
             return false;
         }
+        if (!isAncestor(activeElement, editor.getDomNode())) {
+            _log(loggerService, '[NotebookEditor] focus is outside of the notebook editor, bypass');
+            return false;
+        }
         if (this._focusInsideEmebedMonaco(editor)) {
             _log(loggerService, '[NotebookEditor] focus is on embed monaco editor, bypass');
             return false;
@@ -464,11 +468,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard',
                 'toggleNotebookClipboardLog',
-                "Toggle Notebook Clipboard Troubleshooting"
-            )), original: 'Toggle Notebook Clipboard Troubleshooting' },
+                'Toggle Notebook Clipboard Troubleshooting'
+            )),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js

@@ -7,7 +7,7 @@ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
-import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
 import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';

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

@@ -4,7 +4,7 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { StartFindAction, StartFindReplaceAction, getSelectionSearchString } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { NotebookFindContrib } from './notebookFindWidget.js';
@@ -19,11 +19,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.hideFind',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFind',
                 'notebookActions.hideFind',
-                "Hide Find in Notebook"
-            )), original: 'Hide Find in Notebook' },
+                'Hide Find in Notebook'
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)),
                 primary: 9 ,
@@ -46,11 +46,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.find',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/find/notebookFind',
                 'notebookActions.findInNotebook',
-                "Find in Notebook"
-            )), original: 'Find in Notebook' },
+                'Find in Notebook'
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)), ( EditorContextKeys.focus.toNegated()))),
                 primary: 36  | 2048 ,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerEditorAction, EditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
@@ -28,11 +28,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/format/formatting',
                 'format.title',
-                "Format Notebook"
-            )), original: 'Format Notebook' },
+                'Format Notebook'
+            )),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE)),
             keybinding: {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
@@ -9,11 +9,11 @@ class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions',
                 'notebook.toggleCellToolbarPosition',
-                "Toggle Cell Toolbar Position"
-            )), original: 'Toggle Cell Toolbar Position' },
+                'Toggle Cell Toolbar Position'
+            )),
             menu: [{
                     id: MenuId.NotebookCellTitle,
                     group: 'View',

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -9,7 +9,6 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -52,16 +51,6 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                     mac: { primary: 256  | 2048  | 18 , },
                     weight: 200
                 },
-                {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
-                    primary: 18 ,
-                    weight: 0
-                },
-                {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), ( NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.isEqualTo(false)), NOTEBOOK_CURSOR_NAVIGATION_MODE)), CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
-                    primary: 18 ,
-                    weight: 0
-                },
                 {
                     when: NOTEBOOK_EDITOR_FOCUSED,
                     primary: 2048  | 512  | 12 ,
@@ -103,7 +92,6 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                 'cursorMoveUp',
                 'Focus Previous Cell Editor'
             )),
-            precondition: ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables.js

@@ -11,19 +11,25 @@ import { NOTEBOOK_KERNEL } from 'vscode/vscode/vs/workbench/contrib/notebook/com
 import { variablesViewIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 let NotebookVariables = class NotebookVariables extends Disposable {
-    constructor(editorService, configurationService) {
+    constructor(editorService, configurationService, notebookExecutionStateService) {
         super();
         this.editorService = editorService;
-        this.listener = this.editorService.onDidEditorsChange(() => {
-            if (configurationService.getValue('notebook.experimental.notebookVariablesView')
-                && this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook') {
-                if (this.initializeView()) {
-                    this.listener?.dispose();
-                }
+        this.notebookExecutionStateService = notebookExecutionStateService;
+        this.listeners = [];
+        this.listeners.push(this.editorService.onDidEditorsChange(() => this.handleInitEvent(configurationService)));
+        this.listeners.push(this.notebookExecutionStateService.onDidChangeExecution(() => this.handleInitEvent(configurationService)));
+    }
+    handleInitEvent(configurationService) {
+        if (configurationService.getValue(NotebookSetting.notebookVariablesView)
+            && this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook') {
+            if (this.initializeView()) {
+                this.listeners.forEach(listener => listener.dispose());
             }
-        });
+        }
     }
     initializeView() {
         const debugViewContainer = ( Registry.as('workbench.registry.view.containers')).get(VIEWLET_ID);
@@ -34,7 +40,8 @@ let NotebookVariables = class NotebookVariables extends Disposable {
                 'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables',
                 'notebookVariables',
                 "Notebook Variables"
-            )), containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
+            )),
+                containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
                 order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: ( ContextKeyExpr.notEquals(NOTEBOOK_KERNEL.key, '')),
             };
             viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
@@ -45,7 +52,8 @@ let NotebookVariables = class NotebookVariables extends Disposable {
 };
 NotebookVariables = ( __decorate([
     ( __param(0, IEditorService)),
-    ( __param(1, IConfigurationService))
+    ( __param(1, IConfigurationService)),
+    ( __param(2, INotebookExecutionStateService))
 ], NotebookVariables));
 
 export { NotebookVariables };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js

@@ -0,0 +1,118 @@
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { variablePageSize } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService';
+
+class NotebookVariableDataSource {
+    constructor(notebookKernelService) {
+        this.notebookKernelService = notebookKernelService;
+        this.cancellationTokenSource = ( new CancellationTokenSource());
+    }
+    hasChildren(element) {
+        return element.kind === 'root' || element.hasNamedChildren || element.indexedChildrenCount > 0;
+    }
+    cancel() {
+        this.cancellationTokenSource.cancel();
+        this.cancellationTokenSource.dispose();
+        this.cancellationTokenSource = ( new CancellationTokenSource());
+    }
+    async getChildren(element) {
+        if (element.kind === 'root') {
+            return this.getRootVariables(element.notebook);
+        }
+        else {
+            return this.getVariables(element);
+        }
+    }
+    async getVariables(parent) {
+        const selectedKernel = this.notebookKernelService.getMatchingKernel(parent.notebook).selected;
+        if (selectedKernel && selectedKernel.hasVariableProvider) {
+            let children = [];
+            if (parent.hasNamedChildren) {
+                const variables = selectedKernel.provideVariables(parent.notebook.uri, parent.extHostId, 'named', 0, this.cancellationTokenSource.token);
+                const childNodes = await ( variables
+                    .map(
+                    variable => { return this.createVariableElement(variable, parent.notebook); }
+                ))
+                    .toPromise();
+                children = children.concat(childNodes);
+            }
+            if (parent.indexedChildrenCount > 0) {
+                const childNodes = await this.getIndexedChildren(parent, selectedKernel);
+                children = children.concat(childNodes);
+            }
+            return children;
+        }
+        return [];
+    }
+    async getIndexedChildren(parent, kernel) {
+        const childNodes = [];
+        if (parent.indexedChildrenCount > variablePageSize) {
+            const indexedChildCountLimit = 100000;
+            const limit = Math.min(parent.indexedChildrenCount, indexedChildCountLimit);
+            for (let start = 0; start < limit; start += variablePageSize) {
+                let end = start + variablePageSize;
+                if (end > limit) {
+                    end = limit;
+                }
+                childNodes.push({
+                    kind: 'variable',
+                    notebook: parent.notebook,
+                    id: parent.id + `${start}`,
+                    extHostId: parent.extHostId,
+                    name: `[${start}..${end - 1}]`,
+                    value: '',
+                    indexedChildrenCount: end - start,
+                    indexStart: start,
+                    hasNamedChildren: false
+                });
+            }
+            if (parent.indexedChildrenCount > indexedChildCountLimit) {
+                childNodes.push({
+                    kind: 'variable',
+                    notebook: parent.notebook,
+                    id: parent.id + `${limit + 1}`,
+                    extHostId: parent.extHostId,
+                    name: ( localizeWithPath(
+                        'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource',
+                        'notebook.indexedChildrenLimitReached',
+                        "Display limit reached"
+                    )),
+                    value: '',
+                    indexedChildrenCount: 0,
+                    hasNamedChildren: false
+                });
+            }
+        }
+        else if (parent.indexedChildrenCount > 0) {
+            const variables = kernel.provideVariables(parent.notebook.uri, parent.extHostId, 'indexed', parent.indexStart ?? 0, this.cancellationTokenSource.token);
+            for await (const variable of variables) {
+                childNodes.push(this.createVariableElement(variable, parent.notebook));
+                if (childNodes.length >= variablePageSize) {
+                    break;
+                }
+            }
+        }
+        return childNodes;
+    }
+    async getRootVariables(notebook) {
+        const selectedKernel = this.notebookKernelService.getMatchingKernel(notebook).selected;
+        if (selectedKernel && selectedKernel.hasVariableProvider) {
+            const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, this.cancellationTokenSource.token);
+            return await ( variables
+                .map(variable => { return this.createVariableElement(variable, notebook); }))
+                .toPromise();
+        }
+        return [];
+    }
+    createVariableElement(variable, notebook) {
+        return {
+            ...variable,
+            kind: 'variable',
+            notebook,
+            extHostId: variable.id,
+            id: `${variable.id}`
+        };
+    }
+}
+
+export { NotebookVariableDataSource };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js

@@ -1,6 +1,9 @@
-import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 
+const $ = $$1;
+const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 class NotebookVariablesDelegate {
     getHeight(element) {
         return 22;
@@ -15,11 +18,21 @@ class NotebookVariableRenderer {
         return NotebookVariableRenderer.ID;
     }
     renderTemplate(container) {
-        const wrapper = append(container, $('.variable'));
-        return { wrapper };
-    }
-    renderElement(element, index, templateData, height) {
-        templateData.wrapper.innerText = `${element.element.label} - ${element.element.value}`;
+        const expression = append(container, $('.expression'));
+        const name = append(expression, $('span.name'));
+        const value = append(expression, $('span.value'));
+        const template = { expression, name, value };
+        return template;
+    }
+    renderElement(element, _index, data) {
+        const text = element.element.value.trim() !== '' ? `${element.element.name}:` : element.element.name;
+        data.name.textContent = text;
+        data.name.title = element.element.type ?? '';
+        renderExpressionValue(element.element, data.value, {
+            colorize: true,
+            showHover: true,
+            maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET
+        });
     }
     disposeTemplate() {
     }
@@ -37,7 +50,7 @@ class NotebookVariableAccessibilityProvider {
             'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree',
             'notebookVariableAriaLabel',
             "Variable {0}, value {1}",
-            element.label,
+            element.name,
             element.value
         ));
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -7,13 +7,14 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { WorkbenchObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { NotebookVariableDataSource } from './notebookVariablesDataSource.js';
 import { NotebookVariablesDelegate, NotebookVariableRenderer, NotebookVariableAccessibilityProvider } from './notebookVariablesTree.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
@@ -34,85 +35,61 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         this.notebookExecutionStateService = notebookExecutionStateService;
         this.quickInputService = quickInputService;
         this.commandService = commandService;
-        this.index = 0;
         this._register(this.editorService.onDidActiveEditorChange(this.handleActiveEditorChange.bind(this)));
-        this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
         this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
+        this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
+        this.setActiveNotebook();
+        this.dataSource = ( new NotebookVariableDataSource(this.notebookKernelService));
+        this.updateScheduler = ( new RunOnceScheduler(() => this.tree?.updateChildren(), 100));
     }
     renderBody(container) {
         super.renderBody(container);
-        this.tree = this.instantiationService.createInstance(WorkbenchObjectTree, 'notebookVariablesTree', container, ( new NotebookVariablesDelegate()), [( new NotebookVariableRenderer())], {
-            identityProvider: { getId: (e) => e.id },
-            horizontalScrolling: false,
-            supportDynamicHeights: true,
-            hideTwistiesOfChildlessElements: true,
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( new NotebookVariablesDelegate()), [( new NotebookVariableRenderer())], this.dataSource, {
             accessibilityProvider: ( new NotebookVariableAccessibilityProvider()),
-            setRowLineHeight: false,
+            identityProvider: { getId: (e) => e.id },
         });
         this.tree.layout();
-        this.tree?.setChildren(null, []);
+        if (this.activeNotebook) {
+            this.tree.setInput({ kind: 'root', notebook: this.activeNotebook });
+        }
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
         this.tree?.layout(height, width);
     }
-    handleActiveEditorChange() {
+    setActiveNotebook() {
+        const current = this.activeNotebook;
         const activeEditorPane = this.editorService.activeEditorPane;
         if (activeEditorPane && activeEditorPane.getId() === 'workbench.editor.notebook') {
             const notebookDocument = getNotebookEditorFromEditorPane(activeEditorPane)?.getViewModel()?.notebookDocument;
-            if (notebookDocument && notebookDocument !== this.activeNotebook) {
-                this.activeNotebook = notebookDocument;
-                this.updateVariables(this.activeNotebook);
-            }
+            this.activeNotebook = notebookDocument;
+        }
+        return current !== this.activeNotebook;
+    }
+    handleActiveEditorChange() {
+        if (this.setActiveNotebook() && this.activeNotebook) {
+            this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
+            this.updateScheduler.schedule();
         }
     }
     handleExecutionStateChange(event) {
         if (this.activeNotebook) {
-            if (event.changed === undefined && event.affectsNotebook(this.activeNotebook?.uri)) {
-                this.updateVariables(this.activeNotebook);
+            if (event.affectsNotebook(this.activeNotebook.uri)) {
+                this.dataSource.cancel();
+                if (event.changed === undefined) {
+                    this.updateScheduler.schedule();
+                }
+                else {
+                    this.updateScheduler.cancel();
+                }
             }
         }
     }
     handleVariablesChanged(notebookUri) {
         if (this.activeNotebook && ( notebookUri.toString()) === ( this.activeNotebook.uri.toString())) {
-            this.updateVariables(this.activeNotebook);
-        }
-    }
-    async updateVariables(notebook) {
-        const selectedKernel = this.notebookKernelService.getMatchingKernel(notebook).selected;
-        if (selectedKernel && selectedKernel.hasVariableProvider) {
-            const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
-            const treeData = await ( variables
-                .map(variable => { return this.createTreeItem(variable); }))
-                .toPromise();
-            this.tree?.setChildren(null, treeData);
-        }
-    }
-    createTreeItem(variable) {
-        let collapsed = undefined;
-        let children = undefined;
-        if (variable.namedChildrenCount > 0 || variable.indexedChildrenCount > 0) {
-            collapsed = true;
-            children = [
-                {
-                    element: {
-                        id: `${this.index + 1}-placeholder`,
-                        label: ' ',
-                        value: 'loading...',
-                    }
-                }
-            ];
+            this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
+            this.updateScheduler.schedule();
         }
-        const element = {
-            element: {
-                id: `${this.index++}`,
-                label: variable.variable.name,
-                value: variable.variable.value,
-            },
-            children,
-            collapsed
-        };
-        return element;
     }
 };
 NotebookVariablesView = ( __decorate([

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js

@@ -370,7 +370,7 @@ NotebookOutlineCreator = ( __decorate([
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
-            default: false,
+            default: true,
             markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline',
                 'notebook.gotoSymbols.showAllSymbols',

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

@@ -1,5 +1,5 @@
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -108,11 +108,11 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLineNumbersFromEditorTitle',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/controller/layoutActions',
                 'notebook.toggleLineNumbers',
-                "Toggle Notebook Line Numbers"
-            )), original: 'Toggle Notebook Line Numbers' },
+                'Toggle Notebook Line Numbers'
+            )),
             precondition: NOTEBOOK_EDITOR_FOCUSED,
             menu: [
                 {
@@ -142,11 +142,11 @@ registerAction2(class ToggleCellToolbarPositionFromEditorTitle extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleCellToolbarPositionFromEditorTitle',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/controller/layoutActions',
                 'notebook.toggleCellToolbarPosition',
-                "Toggle Cell Toolbar Position"
-            )), original: 'Toggle Cell Toolbar Position' },
+                'Toggle Cell Toolbar Position'
+            )),
             menu: [{
                     id: MenuId.NotebookEditorLayoutConfigure,
                     group: 'notebookLayoutDetails',
@@ -164,11 +164,11 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 {
     constructor() {
         super({
             id: 'breadcrumbs.toggleFromEditorTitle',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/controller/layoutActions',
                 'notebook.toggleBreadcrumb',
-                "Toggle Breadcrumbs"
-            )), original: 'Toggle Breadcrumbs' },
+                'Toggle Breadcrumbs'
+            )),
             menu: [{
                     id: MenuId.NotebookEditorLayoutConfigure,
                     group: 'notebookLayoutDetails',

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js

@@ -1,5 +1,5 @@
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -19,11 +19,11 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.diff.switchToText',
             icon: openAsTextIcon,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions',
                 'notebook.diff.switchToText',
-                "Open Text Diff Editor"
-            )), original: 'Open Text Diff Editor' },
+                'Open Text Diff Editor'
+            )),
             precondition: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -206,20 +206,20 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', { value: ( localizeWithPath(
+        super('notebook.diff.showOutputs', ( localize2WithPath(
             'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions',
             'notebook.diff.showOutputs',
-            "Show Outputs Differences"
-        )), original: 'Show Outputs Differences' }, ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true)), 2, true, undefined);
+            'Show Outputs Differences'
+        )), ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true)), 2, true, undefined);
     }
 });
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showMetadata', { value: ( localizeWithPath(
+        super('notebook.diff.showMetadata', ( localize2WithPath(
             'vs/workbench/contrib/notebook/browser/diff/notebookDiffActions',
             'notebook.diff.showMetadata',
-            "Show Metadata Differences"
-        )), original: 'Show Metadata Differences' }, ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true)), 1, undefined, true);
+            'Show Metadata Differences'
+        )), ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true)), 1, undefined, true);
     }
 });
 registerAction2(class extends Action2 {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, scheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, getActiveWindow, scheduleAtNextAnimationFrame, getWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { findLastIdx } from 'vscode/vscode/vs/base/common/arraysFind';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
@@ -356,7 +356,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             fontFamily: this._generateFontFamily()
         }, undefined);
         this._list.rowsContainer.insertAdjacentElement('afterbegin', this._modifiedWebview.element);
-        this._modifiedWebview.createWebview();
+        this._modifiedWebview.createWebview(getActiveWindow());
         this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
         this._modifiedWebview.element.style.left = `calc(50%)`;
     }
@@ -370,7 +370,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             fontFamily: this._generateFontFamily()
         }, undefined);
         this._list.rowsContainer.insertAdjacentElement('afterbegin', this._originalWebview.element);
-        this._originalWebview.createWebview();
+        this._originalWebview.createWebview(getActiveWindow());
         this._originalWebview.element.style.width = `calc(50% - 16px)`;
         this._originalWebview.element.style.left = `16px`;
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js

@@ -371,11 +371,11 @@ let NotebookTextDiffList = class NotebookTextDiffList extends WorkbenchList {
         if (styles.listHoverOutline) {
             content.push(`.monaco-list${suffix} > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row:hover { outline: 1px dashed ${styles.listHoverOutline}; outline-offset: -1px; }`);
         }
-        if (styles.listDropBackground) {
+        if (styles.listDropOverBackground) {
             content.push(`
 				.monaco-list${suffix}.drop-target,
 				.monaco-list${suffix} > div.monaco-scrollable-element > .monaco-list-rows.drop-target,
-				.monaco-list${suffix} > div.monaco-scrollable-element > .monaco-list-row.drop-target { background-color: ${styles.listDropBackground} !important; color: inherit !important; }
+				.monaco-list${suffix} > div.monaco-scrollable-element > .monaco-list-row.drop-target { background-color: ${styles.listDropOverBackground} !important; color: inherit !important; }
 			`);
         }
         const newStyles = content.join('\n');

package/vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js

@@ -536,11 +536,12 @@ class NotebookAccessibilityHelpContribution extends Disposable {
     constructor() {
         super();
         this._register(AccessibilityHelpAction.addImplementation(105, 'notebook', async (accessor) => {
-            const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-            if (!codeEditor) {
-                return;
+            const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
+                || accessor.get(ICodeEditorService).getFocusedCodeEditor()
+                || accessor.get(IEditorService).activeEditorPane;
+            if (activeEditor) {
+                runAccessibilityHelpAction(accessor, activeEditor);
             }
-            runAccessibilityHelpAction(accessor, codeEditor);
         }, NOTEBOOK_IS_ACTIVE_EDITOR));
     }
 }
@@ -775,16 +776,39 @@ configurationRegistry.registerConfiguration({
             default: true,
             tags: ['notebookLayout']
         },
-        [NotebookSetting.stickyScroll]: {
+        [NotebookSetting.stickyScrollEnabled]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/notebook.contribution',
-                'notebook.stickyScroll.description',
+                'notebook.stickyScrollEnabled.description',
                 "Experimental. Control whether to render notebook Sticky Scroll headers in the notebook editor."
             )),
             type: 'boolean',
             default: false,
             tags: ['notebookLayout']
         },
+        [NotebookSetting.stickyScrollMode]: {
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                'notebook.stickyScrollMode.description',
+                "Control whether nested sticky lines appear to stack flat or indented."
+            )),
+            type: 'string',
+            enum: ['flat', 'indented'],
+            enumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                    'notebook.stickyScrollMode.flat',
+                    "Nested sticky lines appear flat."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                    'notebook.stickyScrollMode.indented',
+                    "Nested sticky lines appear indented."
+                )),
+            ],
+            default: 'indented',
+            tags: ['notebookLayout']
+        },
         [NotebookSetting.consolidatedOutputButton]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/notebook/browser/notebook.contribution',
@@ -863,7 +887,18 @@ configurationRegistry.registerConfiguration({
             )),
             type: 'number',
             default: 30,
-            tags: ['notebookLayout', 'notebookOutputLayout']
+            tags: ['notebookLayout', 'notebookOutputLayout'],
+            minimum: 1,
+        },
+        [NotebookSetting.LinkifyOutputFilePaths]: {
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                'notebook.disableOutputFilePathLinks',
+                "Control whether to disable filepath links in the output of notebook cells."
+            )),
+            type: 'boolean',
+            default: true,
+            tags: ['notebookOutputLayout']
         },
         [NotebookSetting.markupFontSize]: {
             markdownDescription: ( localizeWithPath(
@@ -1114,6 +1149,15 @@ configurationRegistry.registerConfiguration({
             )),
             type: 'boolean',
             default: false
+        },
+        [NotebookSetting.notebookVariablesView]: {
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/notebook.contribution',
+                'notebook.VariablesView.description',
+                "Enable the experimental notebook variables view within the debug panel."
+            )),
+            type: 'boolean',
+            default: false
         }
     }
 });

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { NotebookEditorWidget, getDefaultNotebookCreationOptions } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -12,6 +12,7 @@ import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebo
 
 let NotebookEditorWidgetService = class NotebookEditorWidgetService {
     constructor(editorGroupService, editorService, contextKeyService) {
+        this.editorGroupService = editorGroupService;
         this._tokenPool = 1;
         this._disposables = ( new DisposableStore());
         this._notebookEditors = ( new Map());
@@ -54,7 +55,7 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
             groupListener.set(id, listeners);
         };
         this._disposables.add(editorGroupService.onDidAddGroup(onNewGroup));
-        editorGroupService.mainPart.whenReady.then(() => editorGroupService.groups.forEach(onNewGroup));
+        editorGroupService.whenReady.then(() => editorGroupService.groups.forEach(onNewGroup));
         this._disposables.add(editorGroupService.onDidRemoveGroup(group => {
             const listeners = groupListener.get(group.id);
             if (listeners) {
@@ -96,6 +97,11 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         domNode.remove();
     }
     _allowWidgetMove(input, sourceID, targetID) {
+        const sourcePart = this.editorGroupService.getPart(sourceID);
+        const targetPart = this.editorGroupService.getPart(targetID);
+        if (sourcePart.windowId !== targetPart.windowId) {
+            return;
+        }
         const targetWidget = this._borrowableEditors.get(targetID)?.get(input.resource);
         if (targetWidget) {
             return;
@@ -130,11 +136,15 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         }
         return ret;
     }
-    retrieveWidget(accessor, group, input, creationOptions, initialDimension) {
+    retrieveWidget(accessor, group, input, creationOptions, initialDimension, codeWindow) {
         let value = this._borrowableEditors.get(group.id)?.get(input.resource);
         if (!value) {
             const instantiationService = accessor.get(IInstantiationService);
-            const widget = instantiationService.createInstance(NotebookEditorWidget, creationOptions ?? getDefaultNotebookCreationOptions(), initialDimension);
+            const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
+            const widget = instantiationService.createInstance(NotebookEditorWidget, {
+                ...ctorOptions,
+                codeWindow: codeWindow ?? ctorOptions.codeWindow,
+            }, initialDimension);
             const token = this._tokenPool++;
             value = { widget, token };
             let map = this._borrowableEditors.get(group.id);

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.js

@@ -9,6 +9,7 @@ import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
@@ -33,6 +34,7 @@ import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/
 import { isProposedApiEnabled, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { InstallRecommendedExtensionAction } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { INotebookDocumentService } from 'vscode/vscode/vs/workbench/services/notebook/common/notebookDocumentService';
 
 var NotebookProviderInfoStore_1, NotebookService_1;
 let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposable {
@@ -328,11 +330,15 @@ NotebookOutputRendererInfoStore = ( __decorate([
     ( __param(0, IStorageService))
 ], NotebookOutputRendererInfoStore));
 class ModelData {
+    get uri() { return this.model.uri; }
     constructor(model, onWillDispose) {
         this.model = model;
         this._modelEventListeners = ( new DisposableStore());
         this._modelEventListeners.add(model.onWillDispose(() => onWillDispose(model)));
     }
+    getCellIndex(cellUri) {
+        return this.model.cells.findIndex(cell => isEqual(cell.uri, cellUri));
+    }
     dispose() {
         this._modelEventListeners.dispose();
     }
@@ -346,7 +352,7 @@ let NotebookService = class NotebookService extends Disposable {
         }
         return this._notebookProviderInfoStore;
     }
-    constructor(_extensionService, _configurationService, _accessibilityService, _instantiationService, _codeEditorService, configurationService, _storageService) {
+    constructor(_extensionService, _configurationService, _accessibilityService, _instantiationService, _codeEditorService, configurationService, _storageService, _notebookDocumentService) {
         super();
         this._extensionService = _extensionService;
         this._configurationService = _configurationService;
@@ -355,6 +361,7 @@ let NotebookService = class NotebookService extends Disposable {
         this._codeEditorService = _codeEditorService;
         this.configurationService = configurationService;
         this._storageService = _storageService;
+        this._notebookDocumentService = _notebookDocumentService;
         this._notebookProviders = ( new Map());
         this._notebookProviderInfoStore = undefined;
         this._notebookRenderersInfoStore = this._instantiationService.createInstance(NotebookOutputRendererInfoStore);
@@ -593,7 +600,9 @@ let NotebookService = class NotebookService extends Disposable {
             throw new Error(`notebook for ${uri} already exists`);
         }
         const notebookModel = this._instantiationService.createInstance(NotebookTextModel, viewType, uri, data.cells, data.metadata, transientOptions);
-        this._models.set(uri, ( new ModelData(notebookModel, this._onWillDisposeDocument.bind(this))));
+        const modelData = ( new ModelData(notebookModel, this._onWillDisposeDocument.bind(this)));
+        this._models.set(uri, modelData);
+        this._notebookDocumentService.addNotebookDocument(modelData);
         this._onWillAddNotebookDocument.fire(notebookModel);
         this._onDidAddNotebookDocument.fire(notebookModel);
         this._postDocumentOpenActivation(viewType);
@@ -613,6 +622,7 @@ let NotebookService = class NotebookService extends Disposable {
         if (modelData) {
             this._onWillRemoveNotebookDocument.fire(modelData.model);
             this._models.delete(model.uri);
+            this._notebookDocumentService.removeNotebookDocument(modelData);
             modelData.dispose();
             this._onDidRemoveNotebookDocument.fire(modelData.model);
         }
@@ -660,7 +670,8 @@ NotebookService = NotebookService_1 = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, ICodeEditorService)),
     ( __param(5, IConfigurationService)),
-    ( __param(6, IStorageService))
+    ( __param(6, IStorageService)),
+    ( __param(7, INotebookDocumentService))
 ], NotebookService));
 
 export { NotebookOutputRendererInfoStore, NotebookProviderInfoStore, NotebookService };

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

@@ -503,7 +503,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         this._spliceNotebookCellOutputs(cell, { start: cell.outputs.length, deleteCount: 0, newOutputs: ( edit.outputs.map(op => ( new NotebookCellOutputTextModel(op)))) }, true, computeUndoRedo);
                     }
                     else {
-                        this._spliceNotebookCellOutputs2(cell, ( edit.outputs.map(op => ( new NotebookCellOutputTextModel(op)))), computeUndoRedo);
+                        this._spliceNotebookCellOutputs2(cell, edit.outputs, computeUndoRedo);
                     }
                     break;
                 }
@@ -889,14 +889,16 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             return;
         }
         if (outputs.length <= 1) {
-            this._spliceNotebookCellOutputs(cell, { start: 0, deleteCount: cell.outputs.length, newOutputs: outputs }, false, computeUndoRedo);
+            this._spliceNotebookCellOutputs(cell, { start: 0, deleteCount: cell.outputs.length, newOutputs: ( outputs.map(op => ( new NotebookCellOutputTextModel(op)))) }, false, computeUndoRedo);
             return;
         }
         const diff = ( new LcsDiff(( new OutputSequence(cell.outputs)), ( new OutputSequence(outputs))));
         const diffResult = diff.ComputeDiff(false);
-        const splices = ( diffResult.changes.map(
-            change => ({ start: change.originalStart, deleteCount: change.originalLength, newOutputs: outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength) })
-        ));
+        const splices = ( diffResult.changes.map(change => ({
+            start: change.originalStart,
+            deleteCount: change.originalLength,
+            newOutputs: ( outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength).map(op => ( new NotebookCellOutputTextModel(op))))
+        })));
         splices.reverse().forEach(splice => {
             this._spliceNotebookCellOutputs(cell, splice, false, computeUndoRedo);
         });

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

@@ -44,7 +44,7 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
     isDirty(resource) {
         return this._dirtyStates.get(resource) ?? false;
     }
-    async createReferencedObject(key, viewType, hasAssociatedFilePath) {
+    async createReferencedObject(key, viewType, hasAssociatedFilePath, limits) {
         this.modelsToDispose.delete(key);
         const uri = ( URI.parse(key));
         const workingCopyTypeId = NotebookWorkingCopyTypeIdentifier.create(viewType);
@@ -55,7 +55,7 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
             this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
         }
         const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager);
-        const result = await model.load();
+        const result = await model.load({ limits });
         let onDirtyAutoReference;
         this._modelListener.set(result, combinedDisposable(result.onDidSave(() => this._onDidSaveNotebook.fire(result.resource)), result.onDidChangeDirty(() => {
             const isDirty = result.isDirty();
@@ -121,7 +121,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
     isDirty(resource) {
         return this._data.isDirty(resource);
     }
-    async resolve(arg0, viewType) {
+    async resolve(arg0, viewType, limits) {
         let resource;
         let hasAssociatedFilePath = false;
         if (URI.isUri(arg0)) {
@@ -178,7 +178,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
                 throw new Error(`A notebook with view type '${existingViewType2}' already exists for '${resource}', CANNOT create another notebook with view type ${viewType}`);
             }
         }
-        const reference = this._data.acquire(( resource.toString()), viewType, hasAssociatedFilePath);
+        const reference = this._data.acquire(( resource.toString()), viewType, hasAssociatedFilePath, limits);
         try {
             const model = await reference.object;
             return {

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

@@ -6,6 +6,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
+import { pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { isNumber } from 'vscode/vscode/vs/base/common/types';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
@@ -102,12 +103,16 @@ let NotebookSearchService = class NotebookSearchService {
         const promises = [];
         contributedNotebookTypes.forEach((notebook) => {
             promises.push((async () => {
+                const canResolve = await this.notebookService.canResolve(notebook.id);
+                if (!canResolve) {
+                    return undefined;
+                }
                 const serializer = (await this.notebookService.withNotebookDataProvider(notebook.id)).serializer;
                 return await serializer.searchInNotebooks(textQuery, token, allPriorityInfo);
             })());
         });
         const start = Date.now();
-        const searchComplete = (await Promise.all(promises));
+        const searchComplete = coalesce(await Promise.all(promises));
         const results = searchComplete.flatMap(e => e.results);
         let limitHit = ( searchComplete.some(e => e.limitHit));
         const uniqueResults = ( new ResourceMap(uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
@@ -138,6 +143,10 @@ let NotebookSearchService = class NotebookSearchService {
                 continue;
             }
             const askMax = isNumber(query.maxResults) ? query.maxResults + 1 : Number.MAX_SAFE_INTEGER;
+            const uri = widget.viewModel.uri;
+            if (!pathIncludedInQuery(query, uri.fsPath)) {
+                continue;
+            }
             let matches = await widget
                 .find(query.contentPattern.pattern, {
                 regex: query.contentPattern.isRegExp,
@@ -148,7 +157,6 @@ let NotebookSearchService = class NotebookSearchService {
                 includeCodeInput: query.contentPattern.notebookInfo?.isInNotebookCellInput ?? true,
                 includeOutput: query.contentPattern.notebookInfo?.isInNotebookCellOutput ?? true,
             }, token, false, true, searchID);
-            const uri = widget.viewModel.uri;
             if (matches.length) {
                 if (askMax && matches.length >= askMax) {
                     limitHit = true;

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js

@@ -126,9 +126,9 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         }
     }
     queueWorkingCopyReload(workingCopy) {
-        const queue = this.workingCopyResolveQueue.queueFor(workingCopy.resource);
-        if (queue.size <= 1) {
-            queue.queue(async () => {
+        const queueSize = this.workingCopyResolveQueue.queueSize(workingCopy.resource);
+        if (queueSize <= 1) {
+            this.workingCopyResolveQueue.queueFor(workingCopy.resource, async () => {
                 try {
                     await this.reload(workingCopy);
                 }
@@ -245,7 +245,8 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
         let didCreateWorkingCopy = false;
         const resolveOptions = {
             contents: options?.contents,
-            forceReadFromFile: options?.reload?.force
+            forceReadFromFile: options?.reload?.force,
+            limits: options?.limits
         };
         if (workingCopy) {
             if (options?.contents) {