fix: 完善错误处理

weavefox · Jan 31, 2024 · fc1d428 · fc1d428
1 parent 2bfc1ea
commit fc1d428
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/convertor.ts b/packages/libro-language-client/src/common/vscodeAdaptor/convertor.ts
@@ -9,7 +9,7 @@ import { EndOfLine, NotebookCellKind, Uri } from './vscodeAdaptor.js';
 export const l2c = {
   asNotebookDocument(libroView: LibroView): NotebookDocument {
     const model = libroView.model as any;
-    if (!model.filePath) {
+    if (model.filePath === undefined) {
       throw new Error('no filePath: invalid libro jupyter model');
     }
     const filePath = model.filePath as string;
@@ -32,7 +32,7 @@ export const l2c = {
 
   asNotebookCell(cell: CellView): NotebookCell {
     const model = cell.parent.model as any;
-    if (!model.filePath) {
+    if (model.filePath === undefined) {
       throw new Error('no filePath: invalid libro jupyter model');
     }
     const filePath = model.filePath as string;

diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts b/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts
@@ -1,3 +1,4 @@
+import type { LibroView } from '@difizen/libro-core';
 import { LibroService } from '@difizen/libro-core';
 import { inject, noop, singleton } from '@difizen/mana-app';
 import type {
@@ -37,6 +38,13 @@ import { unsupported } from './util.js';
 export class LibroWorkspace implements ILibroWorkspace {
   @inject(LibroService) private readonly libroService: LibroService;
 
+  isValidNotebook(view: LibroView): boolean {
+    if ((view as any).lspEnabled === true) {
+      return true;
+    }
+    return false;
+  }
+
   workspaceFolders: WorkspaceFolder[] | undefined = [];
   getWorkspaceFolder(uri: Uri): WorkspaceFolder | undefined {
     return;
@@ -78,26 +86,57 @@ export class LibroWorkspace implements ILibroWorkspace {
   applyEdit(edit: WorkspaceEdit, metadata?: WorkspaceEditMetadata): Thenable<boolean> {
     return Promise.resolve(true);
   }
-  onDidOpenNotebookDocument: Event<NotebookDocument> = (listener) => {
+  onDidOpenNotebookDocument: Event<NotebookDocument> = (
+    listener,
+    thisArgs,
+    disposables,
+  ) => {
     const disposable = this.libroService.onNotebookViewCreated((libroView) => {
+      if (!this.isValidNotebook(libroView)) {
+        return;
+      }
       listener(l2c.asNotebookDocument(libroView));
     });
+    disposables?.push(disposable);
     return disposable;
   };
-  onDidSaveNotebookDocument: Event<NotebookDocument> = (listener) => {
+  onDidSaveNotebookDocument: Event<NotebookDocument> = (
+    listener,
+    thisArgs,
+    disposables,
+  ) => {
     const disposable = this.libroService.onNotebookViewSaved((libroView) => {
+      if (!this.isValidNotebook(libroView)) {
+        return;
+      }
       listener(l2c.asNotebookDocument(libroView));
     });
+    disposables?.push(disposable);
     return disposable;
   };
-  onDidCloseNotebookDocument: Event<NotebookDocument> = (listener) => {
+  onDidCloseNotebookDocument: Event<NotebookDocument> = (
+    listener,
+    thisArgs,
+    disposables,
+  ) => {
     const disposable = this.libroService.onNotebookViewClosed((libroView) => {
+      if (!this.isValidNotebook(libroView)) {
+        return;
+      }
       listener(l2c.asNotebookDocument(libroView));
     });
+    disposables?.push(disposable);
     return disposable;
   };
-  onDidChangeNotebookDocument: Event<NotebookDocumentChangeEvent> = (listener) => {
+  onDidChangeNotebookDocument: Event<NotebookDocumentChangeEvent> = (
+    listener,
+    thisArgs,
+    disposables,
+  ) => {
     const disposable = this.libroService.onNotebookViewChanged((e) => {
+      if (!this.isValidNotebook(e.libroView)) {
+        return;
+      }
       listener({
         notebook: l2c.asNotebookDocument(e.libroView),
         metadata: {},
@@ -116,6 +155,7 @@ export class LibroWorkspace implements ILibroWorkspace {
         }),
       });
     });
+    disposables?.push(disposable);
     return disposable;
   };