@codingame/monaco-vscode-notebook-service-override 25.1.2 → 26.0.1

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

@@ -12,8 +12,8 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 var NotebookVariableRenderer_1;
 const $ = $$1;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
-const NOTEBOOK_TITLE = ( localize2(9322, "Notebook Variables"));
-const REPL_TITLE = ( localize2(9323, "REPL Variables"));
+const NOTEBOOK_TITLE = ( localize2(9642, "Notebook Variables"));
+const REPL_TITLE = ( localize2(9643, "REPL Variables"));
 class NotebookVariablesDelegate {
     getHeight(element) {
         return 22;
@@ -23,8 +23,12 @@ class NotebookVariablesDelegate {
     }
 }
 let NotebookVariableRenderer = class NotebookVariableRenderer {
-    static { NotebookVariableRenderer_1 = this; }
-    static { this.ID = 'variableElement'; }
+    static {
+        NotebookVariableRenderer_1 = this;
+    }
+    static {
+        this.ID = "variableElement";
+    }
     get templateId() {
         return NotebookVariableRenderer_1.ID;
     }
@@ -32,20 +36,25 @@ let NotebookVariableRenderer = class NotebookVariableRenderer {
         this.expressionRenderer = instantiationService.createInstance(DebugExpressionRenderer);
     }
     renderTemplate(container) {
-        const expression = append(container, $('.expression'));
-        const name = append(expression, $('span.name'));
-        const value = append(expression, $('span.value'));
-        const template = { expression, name, value, elementDisposables: ( new DisposableStore()) };
+        const expression = append(container, $(".expression"));
+        const name = append(expression, $("span.name"));
+        const value = append(expression, $("span.value"));
+        const template = {
+            expression,
+            name,
+            value,
+            elementDisposables: ( new DisposableStore())
+        };
         return template;
     }
     renderElement(element, _index, data) {
-        const text = element.element.value.trim() !== '' ? `${element.element.name}:` : element.element.name;
+        const text = element.element.value.trim() !== "" ? `${element.element.name}:` : element.element.name;
         data.name.textContent = text;
-        data.name.title = element.element.type ?? '';
+        data.name.title = element.element.type ?? "";
         data.elementDisposables.add(this.expressionRenderer.renderValue(data.value, element.element, {
             colorize: true,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-            session: undefined,
+            session: undefined
         }));
     }
     disposeElement(element, index, templateData) {
@@ -55,12 +64,10 @@ let NotebookVariableRenderer = class NotebookVariableRenderer {
         templateData.elementDisposables.dispose();
     }
 };
-NotebookVariableRenderer = NotebookVariableRenderer_1 = ( __decorate([
-    ( __param(0, IInstantiationService))
-], NotebookVariableRenderer));
+NotebookVariableRenderer = NotebookVariableRenderer_1 = ( __decorate([( __param(0, IInstantiationService))], NotebookVariableRenderer));
 class NotebookVariableAccessibilityProvider {
     constructor() {
-        this._widgetAriaLabel = observableValue('widgetAriaLabel', NOTEBOOK_TITLE.value);
+        this._widgetAriaLabel = observableValue("widgetAriaLabel", NOTEBOOK_TITLE.value);
     }
     getWidgetAriaLabel() {
         return this._widgetAriaLabel;
@@ -69,7 +76,7 @@ class NotebookVariableAccessibilityProvider {
         this._widgetAriaLabel.set(label, undefined);
     }
     getAriaLabel(element) {
-        return localize(9324, "Variable {0}, value {1}", element.name, element.value);
+        return localize(9644, "Variable {0}, value {1}", element.name, element.value);
     }
 }
 

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

@@ -27,19 +27,55 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
-    static { this.ID = 'notebookVariablesView'; }
-    constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, hoverService, menuService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+    static {
+        this.ID = "notebookVariablesView";
+    }
+    constructor(
+        options,
+        editorService,
+        notebookKernelService,
+        notebookExecutionStateService,
+        keybindingService,
+        contextMenuService,
+        contextKeyService,
+        configurationService,
+        instantiationService,
+        viewDescriptorService,
+        openerService,
+        quickInputService,
+        commandService,
+        themeService,
+        hoverService,
+        menuService
+    ) {
+        super(
+            options,
+            keybindingService,
+            contextMenuService,
+            configurationService,
+            contextKeyService,
+            viewDescriptorService,
+            instantiationService,
+            openerService,
+            themeService,
+            hoverService
+        );
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.notebookExecutionStateService = notebookExecutionStateService;
         this.quickInputService = quickInputService;
         this.commandService = commandService;
         this.menuService = menuService;
-        this._register(this.editorService.onDidActiveEditorChange(() => this.handleActiveEditorChange()));
-        this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
-        this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
-        this._register(this.editorService.onDidCloseEditor((e) => this.handleCloseEditor(e)));
+        this._register(
+            this.editorService.onDidActiveEditorChange(() => this.handleActiveEditorChange())
+        );
+        this._register(
+            this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this))
+        );
+        this._register(
+            this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this))
+        );
+        this._register(this.editorService.onDidCloseEditor(e => this.handleCloseEditor(e)));
         this.accessibilityProvider = ( new NotebookVariableAccessibilityProvider());
         this.handleActiveEditorChange(false);
         this.dataSource = ( new NotebookVariableDataSource(this.notebookKernelService));
@@ -47,14 +83,19 @@ 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()), [this.instantiationService.createInstance(NotebookVariableRenderer)], this.dataSource, {
+        this.element.classList.add("debug-pane");
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, "notebookVariablesTree", container, ( new NotebookVariablesDelegate()), [this.instantiationService.createInstance(NotebookVariableRenderer)], this.dataSource, {
             accessibilityProvider: this.accessibilityProvider,
-            identityProvider: { getId: (e) => e.id },
+            identityProvider: {
+                getId: e => e.id
+            }
         });
         this.tree.layout();
         if (this.activeNotebook) {
-            this.tree.setInput({ kind: 'root', notebook: this.activeNotebook });
+            this.tree.setInput({
+                kind: "root",
+                notebook: this.activeNotebook
+            });
         }
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
     }
@@ -80,7 +121,10 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
             [CONTEXT_VARIABLE_LANGUAGE.key, element.language],
             [CONTEXT_VARIABLE_EXTENSIONID.key, element.extensionId]
         ]);
-        const menuActions = this.menuService.getMenuActions(MenuId.NotebookVariablesContext, overlayedContext, { arg, shouldForwardArgs: true });
+        const menuActions = this.menuService.getMenuActions(MenuId.NotebookVariablesContext, overlayedContext, {
+            arg,
+            shouldForwardArgs: true
+        });
         const actions = getFlatContextMenuActions(menuActions);
         this.contextMenuService.showContextMenu({
             getAnchor: () => e.anchor,
@@ -100,24 +144,31 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         if (isCompositeNotebookEditorInput(editor.input)) {
             this.updateTitle(REPL_TITLE.value);
             this.accessibilityProvider.updateWidgetAriaLabel(REPL_TITLE.value);
-        }
-        else {
+        } else {
             this.updateTitle(NOTEBOOK_TITLE.value);
             this.accessibilityProvider.updateWidgetAriaLabel(NOTEBOOK_TITLE.value);
         }
         if (doUpdate) {
-            this.tree?.setInput({ kind: 'root', notebook: notebookDocument });
+            this.tree?.setInput({
+                kind: "root",
+                notebook: notebookDocument
+            });
             this.updateScheduler.schedule();
         }
     }
     getActiveNotebook() {
         const notebookEditor = this.editorService.activeEditorPane;
         const notebookDocument = getNotebookEditorFromEditorPane(notebookEditor)?.textModel;
-        return notebookDocument && notebookEditor ? { notebookDocument, notebookEditor } : undefined;
+        return notebookDocument && notebookEditor ? {
+            notebookDocument,
+            notebookEditor
+        } : undefined;
     }
     handleCloseEditor(e) {
         if (e.editor.resource && ( e.editor.resource.toString()) === this.activeNotebook?.uri.toString()) {
-            this.tree?.setInput({ kind: 'empty' });
+            this.tree?.setInput({
+                kind: "empty"
+            });
             this.updateScheduler.schedule();
         }
     }
@@ -132,12 +183,10 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
             this.dataSource.cancel();
             if (event.changed === undefined) {
                 this.updateScheduler.schedule();
-            }
-            else {
+            } else {
                 this.updateScheduler.cancel();
             }
-        }
-        else if (!this.getActiveNotebook()) {
+        } else if (!this.getActiveNotebook()) {
             this.editorService.visibleEditorPanes.forEach(editor => {
                 const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
                 if (notebookDocument && event.affectsNotebook(notebookDocument.uri)) {
@@ -149,8 +198,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     handleVariablesChanged(notebookUri) {
         if (this.activeNotebook && ( notebookUri.toString()) === ( this.activeNotebook.uri.toString())) {
             this.updateScheduler.schedule();
-        }
-        else if (!this.getActiveNotebook()) {
+        } else if (!this.getActiveNotebook()) {
             this.editorService.visibleEditorPanes.forEach(editor => {
                 const notebookDocument = getNotebookEditorFromEditorPane(editor)?.textModel;
                 if (notebookDocument && ( notebookDocument.uri.toString()) === ( notebookUri.toString())) {
@@ -160,22 +208,6 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         }
     }
 };
-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, IHoverService)),
-    ( __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, IHoverService)), ( __param(15, IMenuService))], NotebookVariablesView));
 
 export { NotebookVariablesView };