Fixed storing of the notebook-outlineview state data (#13648)

* fixed storing of the notebook-outlineview state data

Signed-off-by: Jonah Iden <[email protected]>

* fixed is function and URI handling

Signed-off-by: Jonah Iden <[email protected]>

* improved is method for NotebookCellOutlineNode

Signed-off-by: Jonah Iden <[email protected]>

---------

Signed-off-by: Jonah Iden <[email protected]>

Author: jonah-iden

packages/notebook/src/browser/contributions/notebook-label-provider-contribution.ts

@@ -16,11 +16,13 @@
 
 import { codicon, LabelProvider, LabelProviderContribution } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { CellKind } from '../../common';
+import { CellKind, CellUri } from '../../common';
 import { NotebookService } from '../service/notebook-service';
 import { NotebookCellOutlineNode } from './notebook-outline-contribution';
 import type Token = require('markdown-it/lib/token');
 import markdownit = require('@theia/core/shared/markdown-it');
+import { NotebookCellModel } from '../view-model/notebook-cell-model';
+import { URI } from '@theia/core';
 
 @injectable()
 export class NotebookLabelProviderContribution implements LabelProviderContribution {
@@ -41,23 +43,43 @@ export class NotebookLabelProviderContribution implements LabelProviderContribut
     }
 
     getIcon(element: NotebookCellOutlineNode): string {
-        return element.notebookCell.cellKind === CellKind.Markup ? codicon('markdown') : codicon('code');
+        const cell = this.findCellByUri(element.uri);
+        if (cell) {
+            return cell.cellKind === CellKind.Markup ? codicon('markdown') : codicon('code');
+        }
+        return '';
     }
 
     getName(element: NotebookCellOutlineNode): string {
-        return element.notebookCell.cellKind === CellKind.Code ?
-            element.notebookCell.text.split('\n')[0] :
-            this.extractPlaintext(this.markdownIt.parse(element.notebookCell.text.split('\n')[0], {}));
+        const cell = this.findCellByUri(element.uri);
+        if (cell) {
+            return cell.cellKind === CellKind.Code ?
+                cell.text.split('\n')[0] :
+                this.extractPlaintext(this.markdownIt.parse(cell.text.split('\n')[0], {}));
+        }
+        return '';
     }
 
     getLongName(element: NotebookCellOutlineNode): string {
-        return element.notebookCell.cellKind === CellKind.Code ?
-            element.notebookCell.text.split('\n')[0] :
-            this.extractPlaintext(this.markdownIt.parse(element.notebookCell.text.split('\n')[0], {}));
+        const cell = this.findCellByUri(element.uri);
+        if (cell) {
+            return cell.cellKind === CellKind.Code ?
+                cell.text.split('\n')[0] :
+                this.extractPlaintext(this.markdownIt.parse(cell.text.split('\n')[0], {}));
+        }
+        return '';
     }
 
     extractPlaintext(parsedMarkdown: Token[]): string {
         return parsedMarkdown.map(token => token.children ? this.extractPlaintext(token.children) : token.content).join('');
     }
 
+    findCellByUri(uri: URI): NotebookCellModel | undefined {
+        const parsed = CellUri.parse(uri);
+        if (parsed) {
+            return this.notebookService.getNotebookEditorModel(parsed.notebook)?.cells.find(cell => cell.handle === parsed?.handle);
+        }
+        return undefined;
+    }
+
 }

packages/notebook/src/browser/contributions/notebook-outline-contribution.ts

@@ -21,18 +21,20 @@ import { OutlineViewService } from '@theia/outline-view/lib/browser/outline-view
 import { NotebookModel } from '../view-model/notebook-model';
 import { OutlineSymbolInformationNode } from '@theia/outline-view/lib/browser/outline-view-widget';
 import { NotebookEditorWidget } from '../notebook-editor-widget';
-import { NotebookCellModel } from '../view-model/notebook-cell-model';
-import { DisposableCollection, URI } from '@theia/core';
+import { DisposableCollection, isObject, URI } from '@theia/core';
 import { CellKind, CellUri } from '../../common';
 import { NotebookService } from '../service/notebook-service';
 export interface NotebookCellOutlineNode extends OutlineSymbolInformationNode {
-    notebookCell: NotebookCellModel;
     uri: URI;
 }
 
 export namespace NotebookCellOutlineNode {
     export function is(element: object): element is NotebookCellOutlineNode {
-        return TreeNode.is(element) && OutlineSymbolInformationNode.is(element) && 'notebookCell' in element;
+        return TreeNode.is(element)
+            && OutlineSymbolInformationNode.is(element)
+            && isObject<NotebookCellOutlineNode>(element)
+            && element.uri instanceof URI
+            && element.uri.scheme === CellUri.cellUriScheme;
     }
 }
 
@@ -94,17 +96,17 @@ export class NotebookOutlineContribution implements FrontendApplicationContribut
             children: [],
             selected: model.selectedCell === cell,
             expanded: false,
-            notebookCell: cell,
-            uri: model.uri,
+            uri: cell.uri,
         } as NotebookCellOutlineNode));
     }
 
     selectCell(node: object): void {
         if (NotebookCellOutlineNode.is(node)) {
-            const parsed = CellUri.parse(node.notebookCell.uri);
+            const parsed = CellUri.parse(node.uri);
             const model = parsed && this.notebookService.getNotebookEditorModel(parsed.notebook);
-            if (model) {
-                model.setSelectedCell(node.notebookCell);
+            const cell = model?.cells.find(c => c.handle === parsed?.handle);
+            if (model && cell) {
+                model.setSelectedCell(cell);
             }
         }
     }