Fix go to definition in Python notebooks (microsoft#16385)

joyceerhl · web-flow · commit cd8f4d3b5c8b · 2021-06-03T12:46:43.000-07:00
* notebook renamed to notebooks, notebooks symbols moved to workspace namespace

* Drop usage of NotebookCellMetadata ctor
diff --git a/src/client/common/application/notebook.ts b/src/client/common/application/notebook.ts
@@ -2,29 +2,30 @@
 // Licensed under the MIT License.
 
 import { inject, injectable } from 'inversify';
-import { DocumentSelector, Event, EventEmitter } from 'vscode';
+import { DocumentSelector, Event, EventEmitter, workspace } from 'vscode';
 import type { notebook, NotebookConcatTextDocument, NotebookDocument } from 'vscode-proposed';
 import { UseProposedApi } from '../constants';
 import { IApplicationEnvironment, IVSCodeNotebook } from './types';
 
 @injectable()
 export class VSCodeNotebook implements IVSCodeNotebook {
     public get onDidOpenNotebookDocument(): Event<NotebookDocument> {
-        return this.canUseNotebookApi
-            ? this.notebook.onDidOpenNotebookDocument
-            : new EventEmitter<NotebookDocument>().event;
+        const onDidOpenNotebookDocument =
+            this.notebook.onDidOpenNotebookDocument ?? (workspace as any).onDidOpenNotebookDocument;
+        return this.canUseNotebookApi ? onDidOpenNotebookDocument : new EventEmitter<NotebookDocument>().event;
     }
     public get onDidCloseNotebookDocument(): Event<NotebookDocument> {
-        return this.canUseNotebookApi
-            ? this.notebook.onDidCloseNotebookDocument
-            : new EventEmitter<NotebookDocument>().event;
+        const onDidCloseNotebookDocument =
+            this.notebook.onDidCloseNotebookDocument ?? (workspace as any).onDidCloseNotebookDocument;
+        return this.canUseNotebookApi ? onDidCloseNotebookDocument : new EventEmitter<NotebookDocument>().event;
     }
     public get notebookDocuments(): ReadonlyArray<NotebookDocument> {
-        return this.canUseNotebookApi ? this.notebook.notebookDocuments : [];
+        const notebookDocuments = this.notebook.notebookDocuments ?? (workspace as any).notebookDocuments;
+        return this.canUseNotebookApi ? notebookDocuments : [];
     }
     private get notebook() {
         if (!this._notebook) {
-            this._notebook = require('vscode').notebook;
+            this._notebook = require('vscode').notebook ?? require('vscode').notebooks;
         }
         return this._notebook!;
     }
diff --git a/src/test/insiders/languageServer.insiders.test.ts b/src/test/insiders/languageServer.insiders.test.ts
@@ -101,15 +101,7 @@ suite('Insiders Test: Language Server', () => {
                 expect(activeEditor).not.to.be.equal(undefined, 'Active editor not found in notebook');
                 await activeEditor!.edit((edit) => {
                     edit.replaceCells(0, 0, [
-                        new vscode.NotebookCellData(
-                            vscode.NotebookCellKind.Code,
-                            PYTHON_LANGUAGE,
-                            'x = 4',
-                            [],
-                            new vscode.NotebookCellMetadata().with({
-                                hasExecutionOrder: false,
-                            }),
-                        ),
+                        new vscode.NotebookCellData(vscode.NotebookCellKind.Code, PYTHON_LANGUAGE, 'x = 4', []),
                     ]);
                 });
 
@@ -124,15 +116,7 @@ suite('Insiders Test: Language Server', () => {
                 await activeEditor!.edit((edit) => {
                     edit.replaceCells(0, 1, []);
                     edit.replaceCells(1, 0, [
-                        new vscode.NotebookCellData(
-                            vscode.NotebookCellKind.Code,
-                            PYTHON_LANGUAGE,
-                            'x = 4',
-                            [],
-                            new vscode.NotebookCellMetadata().with({
-                                hasExecutionOrder: false,
-                            }),
-                        ),
+                        new vscode.NotebookCellData(vscode.NotebookCellKind.Code, PYTHON_LANGUAGE, 'x = 4', []),
                     ]);
                 });
 
