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

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,8 +13,9 @@ 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';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
 const NOTEBOOK_FOCUS_PREVIOUS_EDITOR = 'notebook.focusPreviousEditor';
@@ -26,28 +27,70 @@ 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 FocusNextCellAction extends NotebookCellAction {
+registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: NOTEBOOK_FOCUS_NEXT_EDITOR,
+            id: 'notebook.cell.nullAction',
             title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorMoveDown',
-                'Focus Next Cell Editor'
+                _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, 1, 'Focus Next Cell Editor')),
             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('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    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('top')),
+                             (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none'))
+                        )),
+                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
+                    ))),
                     primary: 18 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
-                    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)), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    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
+                        )),
+                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
+                    ))),
                     primary: 18 ,
                     weight: 200 ,
                 },
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
+                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
                     primary: 2048  | 18 ,
                     mac: { primary: 256  | 2048  | 18 , },
                     weight: 200
@@ -88,19 +131,36 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorMoveUp',
-                'Focus Previous Cell Editor'
-            )),
+            title: ( localizeWithPath(_moduleId, 2, 'Focus Previous Cell Editor')),
             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()))),
+                    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())
+                    ))),
                     primary: 16 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
-                    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)), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    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
+                        )),
+                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
+                    ))),
                     primary: 16 ,
                     weight: 200 ,
                 },
@@ -137,23 +197,19 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'focusFirstCell',
-                'Focus First Cell'
-            )),
+            title: ( localizeWithPath(_moduleId, 3, 'Focus First Cell')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
                     primary: 2048  | 14 ,
                     weight: 200
                 },
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    )),
+                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    ))),
                     mac: { primary: 2048  | 16  },
                     weight: 200
                 }
@@ -173,24 +229,20 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'focusLastCell',
-                'Focus Last Cell'
-            )),
+            title: ( localizeWithPath(_moduleId, 4, 'Focus Last Cell')),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
                     primary: 2048  | 13 ,
                     mac: undefined,
                     weight: 200
                 },
                 {
-                    when: ( ContextKeyExpr.and(
+                    when: ( (ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    )),
+                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    ))),
                     mac: { primary: 2048  | 18  },
                     weight: 200
                 }
@@ -214,13 +266,9 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'focusOutput',
-                '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)),
+                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))),
                 primary: 2048  | 18 ,
                 mac: { primary: 256  | 2048  | 18 , },
                 weight: 200
@@ -237,13 +285,9 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'focusOutputOut',
-                'Focus Out Active Cell Output'
-            )),
+            title: ( localizeWithPath(_moduleId, 6, 'Focus Out Active Cell Output')),
             keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
+                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
                 primary: 2048  | 16 ,
                 mac: { primary: 256  | 2048  | 16 , },
                 weight: 200
@@ -260,11 +304,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'notebookActions.centerActiveCell',
-                "Center Active Cell"
-            )),
+            title: ( localizeWithPath(_moduleId, 7, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: 2048  | 42 ,
@@ -283,14 +323,14 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorPageUp',
-                "Cell Cursor Page Up"
-            )),
+            title: ( localizeWithPath(_moduleId, 8, "Cell Cursor Page Up")),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus
+                    ))),
                     primary: 11 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
@@ -305,14 +345,15 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorPageUpSelect',
-                "Cell Cursor Page Up Select"
-            )),
+            title: ( localizeWithPath(_moduleId, 9, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus,
+                         (NOTEBOOK_OUTPUT_FOCUSED.negate())
+                    ))),
                     primary: 1024  | 11 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
@@ -327,14 +368,14 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorPageDown',
-                "Cell Cursor Page Down"
-            )),
+            title: ( localizeWithPath(_moduleId, 10, "Cell Cursor Page Down")),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus
+                    ))),
                     primary: 12 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
@@ -349,14 +390,15 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'cursorPageDownSelect',
-                "Cell Cursor Page Down Select"
-            )),
+            title: ( localizeWithPath(_moduleId, 11, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
-                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
+                    when: ( (ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                         (ContextKeyExpr.has(InputFocusedContextKey)),
+                        EditorContextKeys.editorTextFocus,
+                         (NOTEBOOK_OUTPUT_FOCUSED.negate())
+                    ))),
                     primary: 1024  | 12 ,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
@@ -373,7 +415,7 @@ function getPageSize(context) {
     const lineHeight = layoutInfo?.fontInfo.lineHeight || 17;
     return Math.max(1, Math.floor((layoutInfo?.height || 0) / lineHeight) - 2);
 }
-( Registry.as(Extensions.Configuration)).registerConfiguration({
+( (Registry.as(Extensions.Configuration))).registerConfiguration({
     id: 'notebook',
     order: 100,
     type: 'object',
@@ -382,8 +424,8 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/navigation/arrow',
-                'notebook.navigation.allowNavigateToSurroundingCells',
+                _moduleId,
+                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/notebookVariables.js

@@ -17,6 +17,7 @@ import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/noteb
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables";
 let NotebookVariables = class NotebookVariables extends Disposable {
     constructor(contextKeyService, configurationService, editorService, notebookExecutionStateService, notebookKernelService, notebookDocumentService) {
         super();
@@ -62,16 +63,12 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         return notebook && this.notebookKernelService.getMatchingKernel(notebook).selected?.hasVariableProvider;
     }
     initializeView() {
-        const debugViewContainer = ( Registry.as('workbench.registry.view.containers')).get(VIEWLET_ID);
+        const debugViewContainer = ( (Registry.as('workbench.registry.view.containers'))).get(VIEWLET_ID);
         if (debugViewContainer) {
-            const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
+            const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
             const viewDescriptor = {
-                id: 'NOTEBOOK_VARIABLES', name: ( localize2WithPath(
-                'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariables',
-                'notebookVariables',
-                "Notebook Variables"
-            )),
-                containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
+                id: 'NOTEBOOK_VARIABLES', name: ( localize2WithPath(_moduleId, 0, "Notebook Variables")),
+                containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(NotebookVariablesView))),
                 order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
             };
             viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
@@ -85,13 +82,13 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         this.configListener.dispose();
     }
 };
-NotebookVariables = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IConfigurationService)),
-    ( __param(2, IEditorService)),
-    ( __param(3, INotebookExecutionStateService)),
-    ( __param(4, INotebookKernelService)),
-    ( __param(5, INotebookService))
-], NotebookVariables));
+NotebookVariables = ( (__decorate([
+    ( (__param(0, IContextKeyService))),
+    ( (__param(1, IConfigurationService))),
+    ( (__param(2, IEditorService))),
+    ( (__param(3, INotebookExecutionStateService))),
+    ( (__param(4, INotebookKernelService))),
+    ( (__param(5, INotebookService)))
+], NotebookVariables)));
 
 export { NotebookVariables };

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

@@ -2,10 +2,11 @@ import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellati
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { variablePageSize } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService';
 
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource";
 class NotebookVariableDataSource {
     constructor(notebookKernelService) {
         this.notebookKernelService = notebookKernelService;
-        this.cancellationTokenSource = ( new CancellationTokenSource());
+        this.cancellationTokenSource = ( (new CancellationTokenSource()));
     }
     hasChildren(element) {
         return element.kind === 'root' || element.hasNamedChildren || element.indexedChildrenCount > 0;
@@ -13,7 +14,7 @@ class NotebookVariableDataSource {
     cancel() {
         this.cancellationTokenSource.cancel();
         this.cancellationTokenSource.dispose();
-        this.cancellationTokenSource = ( new CancellationTokenSource());
+        this.cancellationTokenSource = ( (new CancellationTokenSource()));
     }
     async getChildren(element) {
         if (element.kind === 'root') {
@@ -29,10 +30,10 @@ class NotebookVariableDataSource {
             let children = [];
             if (parent.hasNamedChildren) {
                 const variables = selectedKernel.provideVariables(parent.notebook.uri, parent.extHostId, 'named', 0, this.cancellationTokenSource.token);
-                const childNodes = await ( variables
+                const childNodes = await ( (variables
                     .map(
                     variable => { return this.createVariableElement(variable, parent.notebook); }
-                ))
+                )))
                     .toPromise();
                 children = children.concat(childNodes);
             }
@@ -74,11 +75,7 @@ class NotebookVariableDataSource {
                     notebook: parent.notebook,
                     id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
-                    name: ( localizeWithPath(
-                        'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource',
-                        'notebook.indexedChildrenLimitReached',
-                        "Display limit reached"
-                    )),
+                    name: ( localizeWithPath(_moduleId, 0, "Display limit reached")),
                     value: '',
                     indexedChildrenCount: 0,
                     hasNamedChildren: false
@@ -100,8 +97,8 @@ class NotebookVariableDataSource {
         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); }))
+            return await ( (variables
+                .map(variable => { return this.createVariableElement(variable, notebook); })))
                 .toPromise();
         }
         return [];

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

@@ -1,8 +1,13 @@
+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;
 class NotebookVariablesDelegate {
@@ -13,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) {
@@ -31,29 +40,26 @@ 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(
-            'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree',
-            'debugConsole',
-            "Notebook Variables"
-        ));
+        return ( localizeWithPath(_moduleId, 0, "Notebook Variables"));
     }
     getAriaLabel(element) {
-        return ( localizeWithPath(
-            'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree',
-            'notebookVariableAriaLabel',
-            "Variable {0}, value {1}",
-            element.name,
-            element.value
-        ));
+        return ( localizeWithPath(_moduleId, 1, "Variable {0}, value {1}", element.name, element.value));
     }
 }
 

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';
@@ -25,15 +26,12 @@ import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contr
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView";
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { this.ID = 'notebookVariablesView'; }
-    static { this.TITLE = ( localize2WithPath(
-        'vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView',
-        'notebook.notebookVariables',
-        "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);
+    static { this.TITLE = ( localize2WithPath(_moduleId, 0, "Notebook Variables")); }
+    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;
@@ -44,14 +42,14 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         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));
+        this.dataSource = ( (new NotebookVariableDataSource(this.notebookKernelService)));
+        this.updateScheduler = ( (new RunOnceScheduler(() => this.tree?.updateChildren(), 100)));
     }
     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, {
-            accessibilityProvider: ( new NotebookVariableAccessibilityProvider()),
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( (new NotebookVariablesDelegate())), [( (new NotebookVariableRenderer(this.hoverService)))], this.dataSource, {
+            accessibilityProvider: ( (new NotebookVariableAccessibilityProvider())),
             identityProvider: { getId: (e) => e.id },
         });
         this.tree.layout();
@@ -66,7 +64,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         }
         const element = e.element;
         const arg = {
-            source: ( element.notebook.uri.toString()),
+            source: ( (element.notebook.uri.toString())),
             name: element.name,
             value: element.value,
             type: element.type,
@@ -124,28 +122,29 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         }
     }
     handleVariablesChanged(notebookUri) {
-        if (this.activeNotebook && ( notebookUri.toString()) === ( this.activeNotebook.uri.toString())) {
+        if (this.activeNotebook && ( (notebookUri.toString())) === ( (this.activeNotebook.uri.toString()))) {
             this.tree?.setInput({ kind: 'root', notebook: this.activeNotebook });
             this.updateScheduler.schedule();
         }
     }
 };
-NotebookVariablesView = ( __decorate([
-    ( __param(1, IEditorService)),
-    ( __param(2, INotebookKernelService)),
-    ( __param(3, INotebookExecutionStateService)),
-    ( __param(4, IKeybindingService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, IContextKeyService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IInstantiationService)),
-    ( __param(9, IViewDescriptorService)),
-    ( __param(10, IOpenerService)),
-    ( __param(11, IQuickInputService)),
-    ( __param(12, ICommandService)),
-    ( __param(13, IThemeService)),
-    ( __param(14, ITelemetryService)),
-    ( __param(15, IMenuService))
-], NotebookVariablesView));
+NotebookVariablesView = ( (__decorate([
+    ( (__param(1, IEditorService))),
+    ( (__param(2, INotebookKernelService))),
+    ( (__param(3, INotebookExecutionStateService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IContextMenuService))),
+    ( (__param(6, IContextKeyService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IInstantiationService))),
+    ( (__param(9, IViewDescriptorService))),
+    ( (__param(10, IOpenerService))),
+    ( (__param(11, IQuickInputService))),
+    ( (__param(12, ICommandService))),
+    ( (__param(13, IThemeService))),
+    ( (__param(14, ITelemetryService))),
+    ( (__param(15, IHoverService))),
+    ( (__param(16, IMenuService)))
+], NotebookVariablesView)));
 
 export { NotebookVariablesView };