@codingame/monaco-vscode-notebook-service-override 4.5.2 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
   }
 }

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

@@ -25,8 +25,8 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint";
 const $ = $$1;
@@ -48,11 +48,12 @@ const $ = $$1;
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
 let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
     static { this.ID = 'editor.contrib.emptyTextEditorHint'; }
-    constructor(editor, editorGroupsService, commandService, configurationService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
+    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
         this.editor = editor;
         this.editorGroupsService = editorGroupsService;
         this.commandService = commandService;
         this.configurationService = configurationService;
+        this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.inlineChatSessionService = inlineChatSessionService;
         this.inlineChatService = inlineChatService;
@@ -127,6 +128,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
                 this.editorGroupsService,
                 this.commandService,
                 this.configurationService,
+                this.hoverService,
                 this.keybindingService,
                 this.inlineChatService,
                 this.telemetryService,
@@ -147,20 +149,22 @@ EmptyTextEditorHintContribution = ( (__decorate([
     ( (__param(1, IEditorGroupsService))),
     ( (__param(2, ICommandService))),
     ( (__param(3, IConfigurationService))),
-    ( (__param(4, IKeybindingService))),
-    ( (__param(5, IInlineChatSessionService))),
-    ( (__param(6, IInlineChatService))),
-    ( (__param(7, ITelemetryService))),
-    ( (__param(8, IProductService)))
+    ( (__param(4, IHoverService))),
+    ( (__param(5, IKeybindingService))),
+    ( (__param(6, IInlineChatSessionService))),
+    ( (__param(7, IInlineChatService))),
+    ( (__param(8, ITelemetryService))),
+    ( (__param(9, IProductService)))
 ], EmptyTextEditorHintContribution)));
 class EmptyTextEditorHintContentWidget {
     static { this.ID = 'editor.widget.emptyHint'; }
-    constructor(editor, options, editorGroupsService, commandService, configurationService, keybindingService, inlineChatService, telemetryService, productService) {
+    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatService, telemetryService, productService) {
         this.editor = editor;
         this.options = options;
         this.editorGroupsService = editorGroupsService;
         this.commandService = commandService;
         this.configurationService = configurationService;
+        this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.inlineChatService = inlineChatService;
         this.telemetryService = telemetryService;
@@ -336,7 +340,7 @@ class EmptyTextEditorHintContentWidget {
             anchor.style.cursor = 'pointer';
             const id = keybindingsLookup.shift();
             const title = id && this.keybindingService.lookupKeybinding(id)?.getLabel();
-            hintHandler.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
+            hintHandler.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
         }
         return { hintElement, ariaLabel };
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -22,11 +23,12 @@ let PausedCellDecorationContribution = class PausedCellDecorationContribution ex
         this._currentTopDecorations = [];
         this._currentOtherDecorations = [];
         this._executingCellDecorations = [];
+        const delayer = this._register(( new Delayer(200)));
         this._register(_debugService.getModel().onDidChangeCallStack(() => this.updateExecutionDecorations()));
         this._register(_debugService.getViewModel().onDidFocusStackFrame(() => this.updateExecutionDecorations()));
         this._register(_notebookExecutionStateService.onDidChangeExecution(e => {
             if (e.type === NotebookExecutionType.cell && this._notebookEditor.textModel && e.affectsNotebook(this._notebookEditor.textModel.uri)) {
-                this.updateExecutionDecorations();
+                delayer.trigger(() => this.updateExecutionDecorations());
             }
         }));
     }

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

@@ -3,6 +3,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -15,8 +16,8 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 
 let EmptyCellEditorHintContribution = class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribution {
     static { this.CONTRIB_ID = 'notebook.editor.contrib.emptyCellEditorHint'; }
-    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
-        super(editor, editorGroupsService, commandService, configurationService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService);
+    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
+        super(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService);
         this._editorService = _editorService;
         const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
         if (!activeEditor) {
@@ -56,11 +57,12 @@ EmptyCellEditorHintContribution = ( __decorate([
     ( __param(2, IEditorGroupsService)),
     ( __param(3, ICommandService)),
     ( __param(4, IConfigurationService)),
-    ( __param(5, IKeybindingService)),
-    ( __param(6, IInlineChatSessionService)),
-    ( __param(7, IInlineChatService)),
-    ( __param(8, ITelemetryService)),
-    ( __param(9, IProductService))
+    ( __param(5, IHoverService)),
+    ( __param(6, IKeybindingService)),
+    ( __param(7, IInlineChatSessionService)),
+    ( __param(8, IInlineChatService)),
+    ( __param(9, ITelemetryService)),
+    ( __param(10, IProductService))
 ], EmptyCellEditorHintContribution));
 registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, 0 );
 

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

@@ -241,9 +241,9 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const cellEditorOverridesRaw = editor.notebookOptions.getDisplayOptions().editorOptionsCustomizations;
-        const indentSize = cellEditorOverridesRaw['editor.indentSize'] ?? cellOptions?.indentSize;
-        const insertSpaces = cellEditorOverridesRaw['editor.insertSpaces'] ?? cellOptions?.tabSize;
-        const tabSize = cellEditorOverridesRaw['editor.tabSize'] ?? cellOptions?.insertSpaces;
+        const indentSize = cellEditorOverridesRaw?.['editor.indentSize'] ?? cellOptions?.indentSize;
+        const insertSpaces = cellEditorOverridesRaw?.['editor.insertSpaces'] ?? cellOptions?.insertSpaces;
+        const tabSize = cellEditorOverridesRaw?.['editor.tabSize'] ?? cellOptions?.tabSize;
         const width = typeof indentSize === 'number' ? indentSize : tabSize;
         const message = insertSpaces ? `Spaces: ${width}` : `Tab Size: ${width}`;
         const newText = message;

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

@@ -3,7 +3,7 @@ import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editor
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
@@ -13,7 +13,7 @@ import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workben
 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';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/navigation/arrow";
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
@@ -27,11 +27,36 @@ const NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID = 'notebook.cell.cursorPageUp';
 const NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID = 'notebook.cell.cursorPageUpSelect';
 const NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID = 'notebook.cell.cursorPageDown';
 const NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID = 'notebook.cell.cursorPageDownSelect';
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.cell.nullAction',
+            title: ( localizeWithPath(
+                _moduleId,
+                0,
+                "Keypresses that should be handled by the focused element in the cell output."
+            )),
+            keybinding: [{
+                    when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
+                    primary: 18 ,
+                    weight: 200  + 1
+                }, {
+                    when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
+                    primary: 16 ,
+                    weight: 200  + 1
+                }],
+            f1: false
+        });
+    }
+    run() {
+        return;
+    }
+});
 registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localizeWithPath(_moduleId, 0, 'Focus Next Cell Editor')),
+            title: ( localizeWithPath(_moduleId, 1, 'Focus Next Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -106,7 +131,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localizeWithPath(_moduleId, 1, 'Focus Previous Cell Editor')),
+            title: ( localizeWithPath(_moduleId, 2, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -172,7 +197,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localizeWithPath(_moduleId, 2, 'Focus First Cell')),
+            title: ( localizeWithPath(_moduleId, 3, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -204,7 +229,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localizeWithPath(_moduleId, 3, 'Focus Last Cell')),
+            title: ( localizeWithPath(_moduleId, 4, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
@@ -241,7 +266,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 4, 'Focus In Active Cell Output')),
+            title: ( localizeWithPath(_moduleId, 5, 'Focus In Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))),
                 primary: 2048  | 18 ,
@@ -260,7 +285,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 5, 'Focus Out Active Cell Output')),
+            title: ( localizeWithPath(_moduleId, 6, 'Focus Out Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
                 primary: 2048  | 16 ,
@@ -279,7 +304,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localizeWithPath(_moduleId, 6, "Center Active Cell")),
+            title: ( localizeWithPath(_moduleId, 7, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: 2048  | 42 ,
@@ -298,7 +323,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 7, "Cell Cursor Page Up")),
+            title: ( localizeWithPath(_moduleId, 8, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -320,7 +345,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 8, "Cell Cursor Page Up Select")),
+            title: ( localizeWithPath(_moduleId, 9, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -343,7 +368,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 9, "Cell Cursor Page Down")),
+            title: ( localizeWithPath(_moduleId, 10, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -365,7 +390,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(_moduleId, 10, "Cell Cursor Page Down Select")),
+            title: ( localizeWithPath(_moduleId, 11, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(
@@ -400,7 +425,7 @@ function getPageSize(context) {
             default: true,
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                11,
+                12,
                 "When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
             ))
         }

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

@@ -1,8 +1,12 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $ as $$1, append } from 'vscode/vscode/vs/base/browser/dom';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import 'vscode/vscode/vs/platform/list/browser/listService';
 import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 
+var NotebookVariableRenderer_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree";
 const $ = $$1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
@@ -14,16 +18,20 @@ class NotebookVariablesDelegate {
         return NotebookVariableRenderer.ID;
     }
 }
-class NotebookVariableRenderer {
+let NotebookVariableRenderer = class NotebookVariableRenderer {
+    static { NotebookVariableRenderer_1 = this; }
     static { this.ID = 'variableElement'; }
     get templateId() {
-        return NotebookVariableRenderer.ID;
+        return NotebookVariableRenderer_1.ID;
+    }
+    constructor(_hoverService) {
+        this._hoverService = _hoverService;
     }
     renderTemplate(container) {
         const expression = append(container, $('.expression'));
         const name = append(expression, $('span.name'));
         const value = append(expression, $('span.value'));
-        const template = { expression, name, value };
+        const template = { expression, name, value, elementDisposables: ( (new DisposableStore())) };
         return template;
     }
     renderElement(element, _index, data) {
@@ -32,13 +40,20 @@ class NotebookVariableRenderer {
         data.name.title = element.element.type ?? '';
         renderExpressionValue(element.element, data.value, {
             colorize: true,
-            showHover: true,
+            hover: data.elementDisposables,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET
-        });
+        }, this._hoverService);
     }
-    disposeTemplate() {
+    disposeElement(element, index, templateData, height) {
+        templateData.elementDisposables.clear();
     }
-}
+    disposeTemplate(templateData) {
+        templateData.elementDisposables.dispose();
+    }
+};
+NotebookVariableRenderer = NotebookVariableRenderer_1 = ( (__decorate([
+    ( (__param(0, IHoverService)))
+], NotebookVariableRenderer)));
 class NotebookVariableAccessibilityProvider {
     getWidgetAriaLabel() {
         return ( localizeWithPath(_moduleId, 0, "Notebook Variables"));

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

@@ -8,6 +8,7 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -29,8 +30,8 @@ const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariabl
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { this.ID = 'notebookVariablesView'; }
     static { this.TITLE = ( localize2WithPath(_moduleId, 0, "Notebook Variables")); }
-    constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, menuService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, hoverService, menuService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.notebookExecutionStateService = notebookExecutionStateService;
@@ -47,7 +48,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     renderBody(container) {
         super.renderBody(container);
         this.element.classList.add('debug-pane');
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( (new NotebookVariablesDelegate())), [( (new NotebookVariableRenderer()))], this.dataSource, {
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( (new NotebookVariablesDelegate())), [( (new NotebookVariableRenderer(this.hoverService)))], this.dataSource, {
             accessibilityProvider: ( (new NotebookVariableAccessibilityProvider())),
             identityProvider: { getId: (e) => e.id },
         });
@@ -142,7 +143,8 @@ NotebookVariablesView = ( (__decorate([
     ( (__param(12, ICommandService))),
     ( (__param(13, IThemeService))),
     ( (__param(14, ITelemetryService))),
-    ( (__param(15, IMenuService)))
+    ( (__param(15, IHoverService))),
+    ( (__param(16, IMenuService)))
 ], NotebookVariablesView)));
 
 export { NotebookVariablesView };

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

@@ -27,7 +27,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
-import { NotebookCellOutlineProvider } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider';
 import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -44,6 +43,7 @@ import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { IOutlinePane } from 'vscode/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { INotebookCellOutlineProviderFactory } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.service';
 
 var NotebookCellOutline_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline";
@@ -154,7 +154,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
             const scopedContextKeyService = template.elementDisposables.add(this._contextKeyService.createScoped(template.container));
             NotebookOutlineContext.CellKind.bindTo(scopedContextKeyService).set(isCodeCell ? CellKind.Code : CellKind.Markup);
             NotebookOutlineContext.CellHasChildren.bindTo(scopedContextKeyService).set(length > 0);
-            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== 7);
+            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== 7 );
             NotebookOutlineContext.OutlineElementTarget.bindTo(scopedContextKeyService).set(this._target);
             this.setupFolding(isCodeCell, nbViewModel, scopedContextKeyService, template, nbCell);
             const outlineEntryToolbar = template.elementDisposables.add(( (new ToolBar(template.actionMenu, this._contextMenuService, {
@@ -260,8 +260,9 @@ class NotebookOutlineVirtualDelegate {
     }
 }
 let NotebookQuickPickProvider = class NotebookQuickPickProvider {
-    constructor(_getEntries, _themeService) {
+    constructor(_getEntries, _configurationService, _themeService) {
         this._getEntries = _getEntries;
+        this._configurationService = _configurationService;
         this._themeService = _themeService;
     }
     getQuickPickElements() {
@@ -271,7 +272,21 @@ let NotebookQuickPickProvider = class NotebookQuickPickProvider {
         }
         const result = [];
         const { hasFileIcons } = this._themeService.getFileIconTheme();
-        for (const element of bucket) {
+        const showSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols);
+        const isSymbol = (element) => !!element.symbolKind;
+        const isCodeCell = (element) => ((element.cell.cellKind === CellKind.Code && element.level === 7) );
+        for (let i = 0; i < bucket.length; i++) {
+            const element = bucket[i];
+            const nextElement = bucket[i + 1];
+            if (!showSymbols
+                && isSymbol(element)) {
+                continue;
+            }
+            if (showSymbols
+                && isCodeCell(element)
+                && nextElement && isSymbol(nextElement)) {
+                continue;
+            }
             const useFileIcon = hasFileIcons && !element.symbolKind;
             result.push({
                 element,
@@ -284,7 +299,8 @@ let NotebookQuickPickProvider = class NotebookQuickPickProvider {
     }
 };
 NotebookQuickPickProvider = ( (__decorate([
-    ( (__param(1, IThemeService)))
+    ( (__param(1, IConfigurationService))),
+    ( (__param(2, IThemeService)))
 ], NotebookQuickPickProvider)));
 class NotebookComparator {
     constructor() {
@@ -302,10 +318,10 @@ class NotebookComparator {
 }
 let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
     get entries() {
-        return this._outlineProvider?.entries ?? [];
+        return this._outlineProviderReference?.object?.entries ?? [];
     }
     get activeElement() {
-        return this._outlineProvider?.activeElement;
+        return this._outlineProviderReference?.object?.activeElement;
     }
     constructor(_editor, _target, instantiationService, _editorService, _configurationService) {
         this._editor = _editor;
@@ -319,15 +335,15 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
         const installSelectionListener = () => {
             const notebookEditor = _editor.getControl();
             if (!notebookEditor?.hasModel()) {
-                this._outlineProvider?.dispose();
-                this._outlineProvider = undefined;
+                this._outlineProviderReference?.dispose();
+                this._outlineProviderReference = undefined;
                 this._localDisposables.clear();
             }
             else {
-                this._outlineProvider?.dispose();
+                this._outlineProviderReference?.dispose();
                 this._localDisposables.clear();
-                this._outlineProvider = instantiationService.createInstance(NotebookCellOutlineProvider, notebookEditor, _target);
-                this._localDisposables.add(this._outlineProvider.onDidChange(e => {
+                this._outlineProviderReference = instantiationService.invokeFunction((accessor) => accessor.get(INotebookCellOutlineProviderFactory).getOrCreate(notebookEditor, _target));
+                this._localDisposables.add(this._outlineProviderReference.object.onDidChange(e => {
                     this._onDidChange.fire(e);
                 }));
             }
@@ -364,7 +380,7 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
                     return result;
                 }
             },
-            quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => (this._outlineProvider?.entries ?? [])),
+            quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => (this._outlineProviderReference?.object?.entries ?? [])),
             treeDataSource,
             delegate,
             renderers,
@@ -376,12 +392,12 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
         const showCodeCells = configurationService.getValue(NotebookSetting.outlineShowCodeCells);
         const showCodeCellSymbols = configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
         const showMarkdownHeadersOnly = configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
-        for (const entry of parent instanceof NotebookCellOutline_1 ? (this._outlineProvider?.entries ?? []) : parent.children) {
+        for (const entry of parent instanceof NotebookCellOutline_1 ? (this._outlineProviderReference?.object?.entries ?? []) : parent.children) {
             if (entry.cell.cellKind === CellKind.Markup) {
                 if (!showMarkdownHeadersOnly) {
                     yield entry;
                 }
-                else if (entry.level < 7) {
+                else if (entry.level < 7 ) {
                     yield entry;
                 }
             }
@@ -389,20 +405,20 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
                 if (showCodeCellSymbols) {
                     yield entry;
                 }
-                else if (entry.level === 7) {
+                else if (entry.level === 7 ) {
                     yield entry;
                 }
             }
         }
     }
     async setFullSymbols(cancelToken) {
-        await this._outlineProvider?.setFullSymbols(cancelToken);
+        await this._outlineProviderReference?.object?.setFullSymbols(cancelToken);
     }
     get uri() {
-        return this._outlineProvider?.uri;
+        return this._outlineProviderReference?.object?.uri;
     }
     get isEmpty() {
-        return this._outlineProvider?.isEmpty ?? true;
+        return this._outlineProviderReference?.object?.isEmpty ?? true;
     }
     async reveal(entry, options, sideBySide) {
         await this._editorService.openEditor({
@@ -472,7 +488,7 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
         this._onDidChange.dispose();
         this._dispoables.dispose();
         this._entriesDisposables.dispose();
-        this._outlineProvider?.dispose();
+        this._outlineProviderReference?.dispose();
         this._localDisposables.dispose();
     }
 };
@@ -499,7 +515,7 @@ let NotebookOutlineCreator = class NotebookOutlineCreator {
             await outline.setFullSymbols(cancelToken);
         }
         else if (target === 1  && showAllOutlineSymbols) {
-            await outline.setFullSymbols(cancelToken);
+            void outline.setFullSymbols(cancelToken);
         }
         return outline;
     }

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

@@ -4,12 +4,15 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_HAS_PROVIDER } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, MENU_CELL_CHAT_INPUT, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, MENU_CELL_CHAT_WIDGET, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS, MENU_CELL_CHAT_WIDGET_FEEDBACK } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
 import { NotebookChatController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController';
 import { NotebookAction, NotebookCellAction, getEditorFromArgsOrActivePane, CELL_TITLE_CELL_GROUP_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { insertNewCell } from '../insertCellActions.js';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CellKind, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_GENERATED_BY_CHAT } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -35,7 +38,8 @@ registerAction2(class extends NotebookAction {
                 group: 'navigation',
                 order: 1,
                 when: ( (CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.negate()))
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -57,7 +61,8 @@ registerAction2(class extends NotebookCellAction {
                 ))),
                 weight: 0  + 7,
                 primary: 2048  | 16
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -91,7 +96,8 @@ registerAction2(class extends NotebookAction {
                 ))),
                 weight: 0  + 7,
                 primary: 2048  | 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -117,7 +123,8 @@ registerAction2(class extends NotebookCellAction {
                 ))),
                 weight: 0  + 7,
                 primary: 2048  | 16
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -144,7 +151,8 @@ registerAction2(class extends NotebookCellAction {
                 ))),
                 weight: 0  + 7,
                 primary: 2048  | 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -163,7 +171,8 @@ registerAction2(class extends NotebookAction {
                 group: 'navigation',
                 order: 1,
                 when: CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -180,7 +189,8 @@ registerAction2(class extends NotebookAction {
                 id: MENU_CELL_CHAT_WIDGET,
                 group: 'navigation',
                 order: 2
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -233,7 +243,8 @@ registerAction2(class extends NotebookAction {
                     order: 0,
                     when: ( (CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" ))),
                 }
-            ]
+            ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -260,7 +271,8 @@ registerAction2(class extends NotebookAction {
                 id: MENU_CELL_CHAT_WIDGET_STATUS,
                 group: 'main',
                 order: 1
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -278,7 +290,8 @@ registerAction2(class extends NotebookAction {
                 group: 'inline',
                 order: 1,
                 when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -296,7 +309,8 @@ registerAction2(class extends NotebookAction {
                 group: 'inline',
                 order: 2,
                 when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -314,13 +328,35 @@ registerAction2(class extends NotebookAction {
                 group: 'inline',
                 order: 3,
                 when: ( (CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined))),
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
         NotebookChatController.get(context.notebookEditor)?.feedbackLast(4 );
     }
 });
+async function startChat(accessor, context, index, input, autoSend, source) {
+    const configurationService = accessor.get(IConfigurationService);
+    const commandService = accessor.get(ICommandService);
+    if (configurationService.getValue(NotebookSetting.cellChat)) {
+        context.notebookEditor.focusContainer();
+        NotebookChatController.get(context.notebookEditor)?.run(index, input, autoSend);
+    }
+    else if (configurationService.getValue(NotebookSetting.cellGenerate)) {
+        const activeCell = context.notebookEditor.getActiveCell();
+        const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below'));
+        if (targetCell) {
+            targetCell.enableAutoLanguageDetection();
+            await context.notebookEditor.revealFirstLineIfOutsideViewport(targetCell);
+            const codeEditor = context.notebookEditor.codeEditors.find(ce => ce[0] === targetCell)?.[1];
+            if (codeEditor) {
+                codeEditor.focus();
+                commandService.executeCommand('inlineChat.start');
+            }
+        }
+    }
+}
 registerAction2(class extends NotebookAction {
     constructor() {
         super({
@@ -360,7 +396,10 @@ registerAction2(class extends NotebookAction {
                      (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
                     ContextKeyExpr.not(InputFocusedContextKey),
                     CTX_INLINE_CHAT_HAS_PROVIDER,
-                     (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
+                     (ContextKeyExpr.or(
+                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                    ))
                 ))),
                 weight: 200 ,
                 primary: 2048  | 39 ,
@@ -374,7 +413,10 @@ registerAction2(class extends NotebookAction {
                     when: ( (ContextKeyExpr.and(
                          (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
                         CTX_INLINE_CHAT_HAS_PROVIDER,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
+                         (ContextKeyExpr.or(
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                        ))
                     )))
                 }
             ]
@@ -415,8 +457,7 @@ registerAction2(class extends NotebookAction {
     }
     async runWithContext(accessor, context) {
         const index = Math.max(0, context.cell ? context.notebookEditor.getCellIndex(context.cell) + 1 : 0);
-        context.notebookEditor.focusContainer();
-        NotebookChatController.get(context.notebookEditor)?.run(index, context.input, context.autoSend);
+        await startChat(accessor, context, index, context.input, context.autoSend, context.source);
     }
 });
 registerAction2(class extends NotebookAction {
@@ -437,15 +478,17 @@ registerAction2(class extends NotebookAction {
                     when: ( (ContextKeyExpr.and(
                          (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
                         CTX_INLINE_CHAT_HAS_PROVIDER,
-                         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
+                         (ContextKeyExpr.or(
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+                             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+                        ))
                     )))
                 },
             ]
         });
     }
     async runWithContext(accessor, context) {
-        context.notebookEditor.focusContainer();
-        NotebookChatController.get(context.notebookEditor)?.run(0, '', false);
+        await startChat(accessor, context, 0, '', false);
     }
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
@@ -462,7 +505,10 @@ MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
          (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')),
          (ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')),
         CTX_INLINE_CHAT_HAS_PROVIDER,
-         (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
+         (ContextKeyExpr.or(
+             (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)),
+             (ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))
+        ))
     )))
 });
 registerAction2(class extends NotebookAction {
@@ -490,6 +536,7 @@ registerAction2(class extends NotebookAction {
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -508,6 +555,7 @@ registerAction2(class extends NotebookAction {
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -526,6 +574,7 @@ registerAction2(class extends NotebookAction {
                     weight: 200
                 }
             ],
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -542,7 +591,8 @@ registerAction2(class extends NotebookAction {
                 when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                 weight: 0  + 10,
                 primary: 16 ,
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -559,7 +609,8 @@ registerAction2(class extends NotebookAction {
                 when: ( (ContextKeyExpr.and(CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_INLINE_CHAT_FOCUSED))),
                 weight: 0  + 10,
                 primary: 18
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {
@@ -582,7 +633,8 @@ registerAction2(class extends NotebookCellAction {
                     NOTEBOOK_CELL_GENERATED_BY_CHAT,
                      (ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true))
                 )))
-            }
+            },
+            f1: false
         });
     }
     async runWithContext(accessor, context) {

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

@@ -35,6 +35,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { fixedDiffEditorOptions, fixedEditorOptions, fixedEditorPadding } from './diffCellEditorOptions.js';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { DiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/diffEditorWidget';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 
 function getOptimizedNestedCodeEditorWidgetOptions() {
     return {
@@ -50,7 +51,7 @@ function getOptimizedNestedCodeEditorWidgetOptions() {
     };
 }
 let PropertyHeader = class PropertyHeader extends Disposable {
-    constructor(cell, propertyHeaderContainer, notebookEditor, accessor, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, themeService, telemetryService, accessibilityService) {
+    constructor(cell, propertyHeaderContainer, notebookEditor, accessor, contextMenuService, keybindingService, commandService, notificationService, menuService, contextKeyService, themeService, telemetryService, accessibilityService) {
         super();
         this.cell = cell;
         this.propertyHeaderContainer = propertyHeaderContainer;
@@ -58,6 +59,7 @@ let PropertyHeader = class PropertyHeader extends Disposable {
         this.accessor = accessor;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.commandService = commandService;
         this.notificationService = notificationService;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
@@ -104,7 +106,7 @@ let PropertyHeader = class PropertyHeader extends Disposable {
                 }
                 return undefined;
             }
-        }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.telemetryService));
+        }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService));
         this._register(this._toolbar);
         this._toolbar.context = {
             cell: this.cell
@@ -188,12 +190,13 @@ let PropertyHeader = class PropertyHeader extends Disposable {
 PropertyHeader = ( __decorate([
     ( __param(4, IContextMenuService)),
     ( __param(5, IKeybindingService)),
-    ( __param(6, INotificationService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IThemeService)),
-    ( __param(10, ITelemetryService)),
-    ( __param(11, IAccessibilityService))
+    ( __param(6, ICommandService)),
+    ( __param(7, INotificationService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, IContextKeyService)),
+    ( __param(10, IThemeService)),
+    ( __param(11, ITelemetryService)),
+    ( __param(12, IAccessibilityService))
 ], PropertyHeader));
 class AbstractElementRenderer extends Disposable {
     constructor(notebookEditor, cell, templateData, style, instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService) {
@@ -578,6 +581,7 @@ class SingleSideDiffElement extends AbstractElementRenderer {
         super(notebookEditor, cell, templateData, style, instantiationService, languageService, modelService, textModelService, contextMenuService, keybindingService, notificationService, menuService, contextKeyService, configurationService);
         this.cell = cell;
         this.templateData = templateData;
+        this.updateBorders();
     }
     init() {
         this._diagonalFill = this.templateData.diagonalFill;
@@ -961,6 +965,7 @@ let ModifiedElement = class ModifiedElement extends AbstractElementRenderer {
         this.cell = cell;
         this.templateData = templateData;
         this._editorViewStateChanged = false;
+        this.updateBorders();
     }
     init() { }
     styleContainer(container) {

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

@@ -40,6 +40,22 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import './services/notebookRendererMessagingServiceImpl.js';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import 'vscode/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel';
+import 'vscode/vscode/vs/base/browser/dom';
+import 'vscode/vscode/vs/base/browser/dompurify/dompurify';
+import 'vscode/vscode/vs/base/browser/browser';
+import 'vscode/vscode/vs/base/common/keyCodes';
+import 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/base/common/themables';
+import 'vscode/vscode/vs/base/common/filters';
+import 'vscode/vscode/vs/base/common/strings';
+import 'vscode/external/vscode-marked/lib/marked.esm.js';
+import 'vscode/vscode/vs/base/common/codicons';
+import 'vscode/vscode/vs/platform/markers/common/markers';
+import 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import 'vscode/vscode/vs/editor/common/languages';
+import 'vscode/vscode/vs/base/common/async';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './controller/insertCellActions.js';
 import './controller/executeActions.js';
@@ -849,10 +865,20 @@ configurationRegistry.registerConfiguration({
             default: true,
             tags: ['notebookOutputLayout']
         },
+        [NotebookSetting.minimalErrorRendering]: {
+            description: ( localizeWithPath(
+                _moduleId,
+                35,
+                "Control whether to render error output in a minimal style."
+            )),
+            type: 'boolean',
+            default: false,
+            tags: ['notebookOutputLayout']
+        },
         [NotebookSetting.markupFontSize]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                35,
+                36,
                 "Controls the font size in pixels of rendered markup in notebooks. When set to {0}, 120% of {1} is used.",
                 '`0`',
                 '`#editor.fontSize#`'
@@ -865,7 +891,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.interactiveWindowCollapseCodeCells]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                36,
+                37,
                 "Controls whether code cells in the interactive window are collapsed by default."
             )),
             type: 'string',
@@ -875,7 +901,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputLineHeight]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                37,
+                38,
                 "Line height of the output text within notebook cells.\n - When set to 0, editor line height is used.\n - Values between 0 and 8 will be used as a multiplier with the font size.\n - Values greater than or equal to 8 will be used as effective values."
             )),
             type: 'number',
@@ -885,7 +911,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputFontSize]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                38,
+                39,
                 "Font size for the output text within notebook cells. When set to 0, {0} is used.",
                 '`#editor.fontSize#`'
             )),
@@ -896,7 +922,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputFontFamily]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                39,
+                40,
                 "The font family of the output text within notebook cells. When set to empty, the {0} is used.",
                 '`#editor.fontFamily#`'
             )),
@@ -906,7 +932,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputScrolling]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                40,
+                41,
                 "Initially render notebook outputs in a scrollable region when longer than the limit."
             )),
             type: 'boolean',
@@ -914,7 +940,7 @@ configurationRegistry.registerConfiguration({
             default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
         },
         [NotebookSetting.outputWordWrap]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 41, "Controls whether the lines in output should wrap.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 42, "Controls whether the lines in output should wrap.")),
             type: 'boolean',
             tags: ['notebookLayout', 'notebookOutputLayout'],
             default: false
@@ -922,7 +948,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.formatOnSave]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                42,
+                43,
                 "Format a notebook on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."
             )),
             type: 'boolean',
@@ -932,7 +958,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.insertFinalNewline]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                43,
+                44,
                 "When enabled, insert a final new line into the end of code cells when saving a notebook."
             )),
             type: 'boolean',
@@ -942,20 +968,20 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.codeActionsOnSave]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                44,
+                45,
                 'Run a series of Code Actions for a notebook on save. Code Actions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `"notebook.source.organizeImports": "explicit"`'
             )),
             type: 'object',
             additionalProperties: {
                 type: ['string', 'boolean'],
                 enum: ['explicit', 'never', true, false],
-                enumDescriptions: [( localizeWithPath(_moduleId, 45, 'Triggers Code Actions only when explicitly saved.')), ( localizeWithPath(_moduleId, 46, 'Never triggers Code Actions on save.')), ( localizeWithPath(
+                enumDescriptions: [( localizeWithPath(_moduleId, 46, 'Triggers Code Actions only when explicitly saved.')), ( localizeWithPath(_moduleId, 47, 'Never triggers Code Actions on save.')), ( localizeWithPath(
                     _moduleId,
-                    47,
+                    48,
                     'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
                 )), ( localizeWithPath(
                     _moduleId,
-                    48,
+                    49,
                     'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
                 ))],
             },
@@ -964,7 +990,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.formatOnCellExecution]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                49,
+                50,
                 "Format a notebook cell upon execution. A formatter must be available."
             )),
             type: 'boolean',
@@ -973,7 +999,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.confirmDeleteRunningCell]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                50,
+                51,
                 "Control whether a confirmation prompt is required to delete a running cell."
             )),
             type: 'boolean',
@@ -982,7 +1008,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.findScope]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                51,
+                52,
                 "Customize the Find Widget behavior for searching within notebook cells. When both markup source and markup preview are enabled, the Find Widget will search either the source code or preview based on the current state of the cell."
             )),
             type: 'object',
@@ -1015,7 +1041,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.remoteSaving]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                52,
+                53,
                 "Enables the incremental saving of notebooks in Remote environment. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."
             )),
             type: 'boolean',
@@ -1024,59 +1050,57 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.scrollToRevealCell]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                53,
+                54,
                 "How far to scroll when revealing the next cell upon running {0}.",
                 'notebook.cell.executeAndSelectBelow'
             )),
             type: 'string',
             enum: ['fullCell', 'firstLine', 'none'],
             markdownEnumDescriptions: [
-                ( localizeWithPath(_moduleId, 54, 'Scroll to fully reveal the next cell.')),
-                ( localizeWithPath(_moduleId, 55, 'Scroll to reveal the first line of the next cell.')),
-                ( localizeWithPath(_moduleId, 56, 'Do not scroll.')),
+                ( localizeWithPath(_moduleId, 55, 'Scroll to fully reveal the next cell.')),
+                ( localizeWithPath(_moduleId, 56, 'Scroll to reveal the first line of the next cell.')),
+                ( localizeWithPath(_moduleId, 57, 'Do not scroll.')),
             ],
             default: 'fullCell'
         },
-        [NotebookSetting.anchorToFocusedCell]: {
+        [NotebookSetting.cellChat]: {
+            markdownDescription: ( localizeWithPath(_moduleId, 58, "Enable experimental floating chat widget in notebooks.")),
+            type: 'boolean',
+            default: false
+        },
+        [NotebookSetting.cellGenerate]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                57,
-                "Experimental. Keep the focused cell steady while surrounding cells change size."
+                59,
+                "Enable experimental generate action to create code cell with inline chat enabled."
             )),
-            type: 'string',
-            enum: ['auto', 'on', 'off'],
-            markdownEnumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    58,
-                    "Anchor the viewport to the focused cell depending on context unless {0} is set to {1}.",
-                    'notebook.scrolling.revealCellBehavior',
-                    'none'
-                )),
-                ( localizeWithPath(_moduleId, 59, "Always anchor the viewport to the focused cell.")),
-                ( localizeWithPath(_moduleId, 60, "The focused cell may shift around as cells resize."))
-            ],
-            default: 'auto'
-        },
-        [NotebookSetting.cellChat]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 61, "Enable experimental floating chat widget in notebooks.")),
             type: 'boolean',
-            default: false
+            default: typeof product$1.quality === 'string' && product$1.quality !== 'stable',
+            tags: ['experimental']
         },
         [NotebookSetting.notebookVariablesView]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                62,
+                60,
                 "Enable the experimental notebook variables view within the debug panel."
             )),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellFailureDiagnostics]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 63, "Show available diagnostics for cell failures.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 61, "Show available diagnostics for cell failures.")),
             type: 'boolean',
             default: true
         },
+        [NotebookSetting.outputBackupSizeLimit]: {
+            markdownDescription: ( localizeWithPath(
+                _moduleId,
+                62,
+                "The limit of notebook output size in kilobytes (KB) where notebook files will no longer be backed up for hot reload. Use 0 for unlimited."
+            )),
+            type: 'number',
+            default: 10000
+        }
     }
 });
 

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

@@ -14,6 +14,7 @@ import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
+import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
 
 var NotebookTextModel_1;
 class StackOperation {
@@ -141,13 +142,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     get alternativeVersionId() {
         return this._alternativeVersionId;
     }
-    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService) {
+    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService) {
         super();
         this.viewType = viewType;
         this.uri = uri;
         this._undoService = _undoService;
         this._modelService = _modelService;
         this._languageService = _languageService;
+        this._languageDetectionService = _languageDetectionService;
         this._isDisposed = false;
         this._onWillDispose = this._register(( new Emitter()));
         this._onWillAddRemoveCells = this._register(( new Emitter()));
@@ -235,7 +237,8 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 cell.internalMetadata,
                 collapseState,
                 this.transientOptions,
-                this._languageService
+                this._languageService,
+                this._languageDetectionService
             ));
         }));
         for (let i = 0; i < mainCells.length; i++) {
@@ -608,7 +611,8 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 cellDto.internalMetadata,
                 collapseState,
                 this.transientOptions,
-                this._languageService
+                this._languageService,
+                this._languageDetectionService
             ));
             const textModel = this._modelService.getModel(cellUri);
             if (textModel && textModel instanceof TextModel) {
@@ -983,7 +987,8 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
 NotebookTextModel = NotebookTextModel_1 = ( __decorate([
     ( __param(5, IUndoRedoService)),
     ( __param(6, IModelService)),
-    ( __param(7, ILanguageService))
+    ( __param(7, ILanguageService)),
+    ( __param(8, ILanguageDetectionService))
 ], NotebookTextModel));
 class OutputSequence {
     constructor(outputs) {

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

@@ -210,7 +210,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         let sourceContents;
         const sourceWorkingCopy = this.get(source);
         if (sourceWorkingCopy?.isResolved()) {
-            sourceContents = await sourceWorkingCopy.model.snapshot(CancellationToken.None);
+            sourceContents = await sourceWorkingCopy.model.snapshot(1 , CancellationToken.None);
         }
         else {
             sourceContents = (await this.fileService.readFileStream(source)).value;

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

@@ -162,7 +162,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
                             workingCopiesToRestore.push({
                                 source: sourceResource,
                                 target: targetResource,
-                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(CancellationToken.None) : undefined
+                                snapshot: sourceWorkingCopy.isDirty() ? await sourceWorkingCopy.model?.snapshot(1 , CancellationToken.None) : undefined
                             });
                         }
                     }

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

@@ -105,7 +105,7 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
     async backup(token) {
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(token), token);
+            content = await raceCancellation(this.model.snapshot(2 , token), token);
         }
         else if (this.initialContents) {
             content = this.initialContents.value;