@theia/notebook 1.56.0 → 1.57.0-next.136

package/src/browser/service/notebook-execution-service.ts

@@ -18,13 +18,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { CellExecution, NotebookExecutionStateService } from '../service/notebook-execution-state-service';
 import { CellKind, NotebookCellExecutionState } from '../../common';
 import { NotebookCellModel } from '../view-model/notebook-cell-model';
 import { NotebookModel } from '../view-model/notebook-model';
 import { NotebookKernelService } from './notebook-kernel-service';
-import { CommandService, Disposable } from '@theia/core';
+import { CommandService, Disposable, ILogger } from '@theia/core';
 import { NotebookKernelQuickPickService } from './notebook-kernel-quick-pick-service';
 import { NotebookKernelHistoryService } from './notebook-kernel-history-service';
 
@@ -50,6 +50,9 @@ export class NotebookExecutionService {
     @inject(NotebookKernelQuickPickService)
     protected notebookKernelQuickPickService: NotebookKernelQuickPickService;
 
+    @inject(ILogger) @named('notebook')
+    protected readonly logger: ILogger;
+
     protected readonly cellExecutionParticipants = new Set<CellExecutionParticipant>();
 
     async executeNotebookCells(notebook: NotebookModel, cells: Iterable<NotebookCellModel>): Promise<void> {
@@ -59,6 +62,11 @@ export class NotebookExecutionService {
             return;
         }
 
+        this.logger.debug('Executing notebook cells', {
+            notebook: notebook.uri.toString(),
+            cells: cellsArr.map(c => c.handle)
+        });
+
         // create cell executions
         const cellExecutions: [NotebookCellModel, CellExecution][] = [];
         for (const cell of cellsArr) {
@@ -71,6 +79,7 @@ export class NotebookExecutionService {
         const kernel = await this.notebookKernelHistoryService.resolveSelectedKernel(notebook);
 
         if (!kernel) {
+            this.logger.debug('Failed to resolve kernel for execution', notebook.uri.toString());
             // clear all pending cell executions
             cellExecutions.forEach(cellExe => cellExe[1].complete({}));
             return;
@@ -99,7 +108,16 @@ export class NotebookExecutionService {
             });
             await this.runExecutionParticipants(validCellExecutions);
 
+            this.logger.debug('Selecting kernel for cell execution', {
+                notebook: notebook.uri.toString(),
+                kernel: kernel.id
+            });
             this.notebookKernelService.selectKernelForNotebook(kernel, notebook);
+
+            this.logger.debug('Running cell execution request', {
+                notebook: notebook.uri.toString(),
+                cells: validCellExecutions.map(c => c.cellHandle)
+            });
             await kernel.executeNotebookCellsRequest(notebook.uri, validCellExecutions.map(c => c.cellHandle));
             // the connecting state can change before the kernel resolves executeNotebookCellsRequest
             const unconfirmed = validCellExecutions.filter(exe => exe.state === NotebookCellExecutionState.Unconfirmed);

package/src/browser/service/notebook-execution-state-service.ts

@@ -169,7 +169,6 @@ export class CellExecution implements Disposable {
         readonly cellHandle: number,
         protected readonly notebook: NotebookModel,
     ) {
-        console.debug(`CellExecution#ctor ${this.getCellLog()}`);
     }
 
     initialize(): void {
@@ -188,10 +187,6 @@ export class CellExecution implements Disposable {
         this.applyCellExecutionEditsToNotebook([startExecuteEdit]);
     }
 
-    protected getCellLog(): string {
-        return `${this.notebookURI.toString()}, ${this.cellHandle}`;
-    }
-
     confirm(): void {
         this._state = NotebookCellExecutionState.Pending;
         this.onDidUpdateEmitter.fire();

package/src/browser/service/notebook-kernel-quick-pick-service.ts

@@ -18,8 +18,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ArrayUtils, CommandService, DisposableCollection, Event, nls, QuickInputButton, QuickInputService, QuickPickInput, QuickPickItem, URI, } from '@theia/core';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { ArrayUtils, CommandService, DisposableCollection, Event, ILogger, nls, QuickInputButton, QuickInputService, QuickPickInput, QuickPickItem, URI, } from '@theia/core';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { NotebookKernelService, NotebookKernel, NotebookKernelMatchResult, SourceCommand } from './notebook-kernel-service';
 import { NotebookModel } from '../view-model/notebook-model';
 import { NotebookEditorWidget } from '../notebook-editor-widget';
@@ -89,12 +89,12 @@ export class NotebookKernelQuickPickService {
     protected readonly quickInputService: QuickInputService;
     @inject(CommandService)
     protected readonly commandService: CommandService;
-
     @inject(OpenerService)
-    protected openerService: OpenerService;
-
+    protected readonly openerService: OpenerService;
     @inject(NotebookKernelHistoryService)
-    protected notebookKernelHistoryService: NotebookKernelHistoryService;
+    protected readonly notebookKernelHistoryService: NotebookKernelHistoryService;
+    @inject(ILogger) @named('notebook')
+    protected readonly logger: ILogger;
 
     async showQuickPick(editor: NotebookModel, wantedId?: string, skipAutoRun?: boolean): Promise<boolean> {
         const notebook = editor;
@@ -238,6 +238,10 @@ export class NotebookKernelQuickPickService {
     }
 
     protected selectKernel(notebook: NotebookModel, kernel: NotebookKernel): void {
+        this.logger.debug('Selected notebook kernel', {
+            notebook: notebook.uri.toString(),
+            kernel: kernel.id
+        });
         const currentInfo = this.notebookKernelService.getMatchingKernel(notebook);
         if (currentInfo.selected) {
             // there is already a selected kernel
@@ -270,6 +274,10 @@ export class NotebookKernelQuickPickService {
         }
 
         if (isSourcePick(pick)) {
+            this.logger.debug('Selected notebook kernel command', {
+                notebook: editor.uri.toString(),
+                command: pick.action.command.id
+            });
             // selected explicitly, it should trigger the execution?
             pick.action.run(this.commandService);
         }

package/src/browser/service/notebook-model-resolver-service.ts

@@ -65,14 +65,21 @@ export class NotebookModelResolverService {
             throw new Error(`Missing viewType for '${resource}'`);
         }
 
-        const actualResource = await this.resourceProvider(resource);
-        const notebookData = await this.resolveExistingNotebookData(actualResource, viewType!);
-        const notebookModel = await this.notebookService.createNotebookModel(notebookData, viewType, actualResource);
+        try {
 
-        notebookModel.onDirtyChanged(() => this.onDidChangeDirtyEmitter.fire(notebookModel));
-        notebookModel.onDidSaveNotebook(() => this.onDidSaveNotebookEmitter.fire(notebookModel.uri.toComponents()));
+            const actualResource = await this.resourceProvider(resource);
+            const notebookData = await this.resolveExistingNotebookData(actualResource, viewType!);
+            const notebookModel = await this.notebookService.createNotebookModel(notebookData, viewType, actualResource);
 
-        return notebookModel;
+            notebookModel.onDirtyChanged(() => this.onDidChangeDirtyEmitter.fire(notebookModel));
+            notebookModel.onDidSaveNotebook(() => this.onDidSaveNotebookEmitter.fire(notebookModel.uri.toComponents()));
+
+            return notebookModel;
+        } catch (e) {
+            const message = `Error resolving notebook model for: \n ${resource.path.fsPath()} \n with view type ${viewType}. \n ${e}`;
+            console.error(message);
+            throw new Error(message);
+        }
     }
 
     async resolveUntitledResource(arg: UntitledResource, viewType: string): Promise<NotebookModel> {

package/src/browser/service/notebook-options.ts

@@ -21,7 +21,7 @@ import { Emitter } from '@theia/core';
 import { NotebookPreferences, notebookPreferenceSchema } from '../contributions/notebook-preferences';
 import { EditorPreferences } from '@theia/editor/lib/browser';
 import { BareFontInfo } from '@theia/monaco-editor-core/esm/vs/editor/common/config/fontInfo';
-import { PixelRatio } from '@theia/monaco-editor-core/esm/vs/base/browser/browser';
+import { PixelRatio } from '@theia/monaco-editor-core/esm/vs/base/browser/pixelRatio';
 
 const notebookOutputOptionsRelevantPreferences = [
     'editor.fontSize',
@@ -149,7 +149,7 @@ export class NotebookOptionsService {
             fontLigatures: this.editorPreferences['editor.fontLigatures'],
             lineHeight: this.editorPreferences['editor.lineHeight'],
             letterSpacing: this.editorPreferences['editor.letterSpacing'],
-        }, PixelRatio.value);
+        }, PixelRatio.getInstance(window).value);
     }
 
 }

package/src/browser/style/index.css

@@ -31,7 +31,6 @@
   pointer-events: none;
 }
 
-
 .theia-notebook-cell-output-webview {
   padding: 5px 0px;
   margin: 0px 15px 0px 50px;
@@ -77,7 +76,8 @@
 
 .theia-notebook-cell-content {
   flex: 1;
-  width: calc(100% - 15px);
+  /* needs this set width because of monaco. 56px is sidebar + gap to sidebar  */
+  width: calc(100% - 56px);
 }
 
 /* Rendered Markdown Content */
@@ -88,16 +88,16 @@
   font-size: var(--theia-notebook-markdown-size);
 }
 
-.theia-notebook-markdown-content>* {
+.theia-notebook-markdown-content > * {
   font-weight: 400;
 }
 
-.theia-notebook-markdown-content>*:first-child {
+.theia-notebook-markdown-content > *:first-child {
   margin-top: 0;
   padding-top: 0;
 }
 
-.theia-notebook-markdown-content>*:last-child {
+.theia-notebook-markdown-content > *:last-child {
   margin-bottom: 0;
   padding-bottom: 0;
 }
@@ -107,14 +107,19 @@
 }
 
 /* Markdown cell edit mode */
-.theia-notebook-cell-content:has(.theia-notebook-markdown-editor-container>.theia-notebook-cell-editor) {
+.theia-notebook-cell-content:has(
+    .theia-notebook-markdown-editor-container > .theia-notebook-cell-editor
+  ) {
   pointer-events: all;
   margin-right: var(--theia-notebook-cell-editor-margin-right);
   outline: 1px solid var(--theia-notebook-cellBorderColor);
 }
 
 /* Markdown cell edit mode focused */
-.theia-notebook-cell.focused .theia-notebook-cell-content:has(.theia-notebook-markdown-editor-container>.theia-notebook-cell-editor) {
+.theia-notebook-cell.focused
+  .theia-notebook-cell-content:has(
+    .theia-notebook-markdown-editor-container > .theia-notebook-cell-editor
+  ) {
   outline-color: var(--theia-notebook-focusedEditorBorder);
 }
 
@@ -126,6 +131,10 @@
   padding: 10px 10px 0 10px;
 }
 
+.theia-notebook-cell-editor .monaco-editor {
+  outline: none;
+}
+
 .theia-notebook-cell-editor-container {
   pointer-events: all;
   width: calc(100% - 46px);
@@ -242,11 +251,23 @@
 
 .theia-notebook-main-container .theia-notebook-main-loading-indicator {
   /* `progress-animation` is defined in `packages/core/src/browser/style/progress-bar.css` */
-  animation: progress-animation 1.8s 0s infinite cubic-bezier(0.645, 0.045, 0.355, 1);
+  animation: progress-animation 1.8s 0s infinite
+    cubic-bezier(0.645, 0.045, 0.355, 1);
   background-color: var(--theia-progressBar-background);
   height: 2px;
 }
 
+.error-message {
+  justify-content: center;
+  margin: 0 50px;
+  text-align: center;
+}
+
+.error-message > span {
+  color: var(--theia-errorForeground);
+  font-size: 40px !important;
+}
+
 .theia-notebook-viewport {
   display: flex;
   overflow: hidden;
@@ -317,7 +338,7 @@
   background-color: var(--theia-toolbar-active);
 }
 
-.theia-notebook-add-cell-button>* {
+.theia-notebook-add-cell-button > * {
   vertical-align: middle;
 }
 
@@ -393,7 +414,7 @@
   transform: translateY(calc(-100% - 10px));
 }
 
-.theia-notebook-find-widget.search-mode>*>*:nth-child(2) {
+.theia-notebook-find-widget.search-mode > * > *:nth-child(2) {
   display: none;
 }
 
@@ -422,8 +443,8 @@
   align-items: center;
 }
 
-.theia-notebook-find-widget-buttons-first>div,
-.theia-notebook-find-widget-buttons-second>div {
+.theia-notebook-find-widget-buttons-first > div,
+.theia-notebook-find-widget-buttons-second > div {
   margin-right: 4px;
 }
 
@@ -481,7 +502,8 @@
   margin: 2px;
 }
 
-.theia-notebook-find-widget-input-wrapper .theia-notebook-find-widget-input:focus {
+.theia-notebook-find-widget-input-wrapper
+  .theia-notebook-find-widget-input:focus {
   border: none;
   outline: none;
 }

package/src/browser/view/notebook-cell-list-view.tsx

@@ -120,7 +120,7 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
 
     override render(): React.ReactNode {
         return <ul className='theia-notebook-cell-list' ref={this.cellListRef} onDragStart={e => this.onDragStart(e)}>
-            {this.props.notebookModel.cells
+            {this.props.notebookModel.getVisibleCells()
                 .map((cell, index) =>
                     <React.Fragment key={'cell-' + cell.handle}>
                         <NotebookCellDivider

package/src/browser/view-model/notebook-model.ts

@@ -289,6 +289,10 @@ export class NotebookModel implements Saveable, Disposable {
         }
     }
 
+    getVisibleCells(): NotebookCellModel[] {
+        return this.cells;
+    }
+
     applyEdits(rawEdits: CellEditOperation[], computeUndoRedo: boolean): void {
         const editsWithDetails = rawEdits.map((edit, index) => {
             let cellIndex: number = -1;
@@ -390,7 +394,12 @@ export class NotebookModel implements Saveable, Disposable {
         });
         this.addCellOutputListeners(cells);
 
-        const changes: NotebookCellTextModelSplice<NotebookCellModel>[] = [{ start, deleteCount, newItems: cells }];
+        const changes: NotebookCellTextModelSplice<NotebookCellModel>[] = [{
+            start,
+            deleteCount,
+            newItems: cells,
+            startHandle: this.cells[start]?.handle ?? -1 // -1 in case of new Cells are added at the end.
+        }];
 
         const deletedCells = this.cells.splice(start, deleteCount, ...cells);
 

package/src/common/notebook-common.ts

@@ -126,6 +126,11 @@ export interface NotebookCellTextModelSplice<T> {
     start: number,
     deleteCount: number,
     newItems: T[]
+    /**
+     * In case of e.g. deletion, the handle of the first cell that was deleted.
+     * -1 in case of new Cells are added at the end.
+     */
+    startHandle: number,
 };
 
 export enum NotebookCellsChangeType {