Update renderers and notebooks to use new API (#13665)

* Update renderers and notebooks to use new API

Author: DonJayamanne

.vscode/launch.json

@@ -2,24 +2,6 @@
 {
     "version": "0.1.0",
     "configurations": [
-        {
-            "name": "Node: Current File",
-            "program": "${file}",
-            "request": "launch",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "pwa-node"
-        },
-        {
-            "name": "Python: Current File",
-            "type": "python",
-            "justMyCode": true,
-            "request": "launch",
-            "program": "${file}",
-            "console": "integratedTerminal",
-            "cwd": "${workspaceFolder}"
-        },
         {
             "name": "Extension",
             "type": "extensionHost",
@@ -304,6 +286,24 @@
             "program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
             "args": ["watch"],
             "skipFiles": ["<node_internals>/**"]
+        },
+        {
+            "name": "Node: Current File",
+            "program": "${file}",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "pwa-node"
+        },
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "justMyCode": true,
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceFolder}"
         }
     ]
 }

package-lock.json

@@ -28,7 +28,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.47.0"
+        "vscode": "^1.48.0"
     },
     "keywords": [
         "python",
@@ -3419,7 +3419,8 @@
         },
         "notebookOutputRenderer": [
             {
-                "viewType": "jupyter-notebook-renderer",
+                "id": "jupyter-notebook-renderer",
+                "entrypoint": "./out/datascience-ui/renderers/renderers.js",
                 "displayName": "Jupyter Notebook Renderer",
                 "mimeTypes": [
                     "application/geo+json",
@@ -3637,6 +3638,7 @@
         "@types/untildify": "^3.0.0",
         "@types/uuid": "^3.4.3",
         "@types/vscode": "^1.47.0",
+        "@types/vscode-notebook-renderer": "^1.48.0",
         "@types/webpack-bundle-analyzer": "^2.13.0",
         "@types/winreg": "^1.2.30",
         "@types/ws": "^6.0.1",

package.json

@@ -11,9 +11,7 @@ import type {
     NotebookDocumentFilter,
     NotebookEditor,
     NotebookKernel,
-    NotebookKernelProvider,
-    NotebookOutputRenderer,
-    NotebookOutputSelector
+    NotebookKernelProvider
 } from 'vscode-proposed';
 import { UseProposedApi } from '../constants';
 import { IDisposableRegistry } from '../types';
@@ -107,13 +105,6 @@ export class VSCodeNotebook implements IVSCodeNotebook {
     ): Disposable {
         return this.notebook.registerNotebookKernelProvider(selector, provider);
     }
-    public registerNotebookOutputRenderer(
-        id: string,
-        outputSelector: NotebookOutputSelector,
-        renderer: NotebookOutputRenderer
-    ): Disposable {
-        return this.notebook.registerNotebookOutputRenderer(id, outputSelector, renderer);
-    }
     private addEventHandlers() {
         if (this.addedEventHandlers) {
             return;

src/client/common/application/notebook.ts

@@ -67,9 +67,7 @@ import type {
     NotebookDocumentFilter,
     NotebookEditor,
     NotebookKernel,
-    NotebookKernelProvider,
-    NotebookOutputRenderer,
-    NotebookOutputSelector
+    NotebookKernelProvider
 } from 'vscode-proposed';
 import * as vsls from 'vsls/vscode';
 
@@ -1546,10 +1544,4 @@ export interface IVSCodeNotebook {
     registerNotebookContentProvider(notebookType: string, provider: NotebookContentProvider): Disposable;
 
     registerNotebookKernelProvider(selector: NotebookDocumentFilter, provider: NotebookKernelProvider): Disposable;
-
-    registerNotebookOutputRenderer(
-        id: string,
-        outputSelector: NotebookOutputSelector,
-        renderer: NotebookOutputRenderer
-    ): Disposable;
 }

src/client/common/application/types.ts

@@ -18,7 +18,6 @@ import { noop } from '../../common/utils/misc';
 import { JupyterNotebookView } from './constants';
 import { isJupyterNotebook } from './helpers/helpers';
 import { VSCodeKernelPickerProvider } from './kernelProvider';
-import { NotebookOutputRenderer } from './renderer';
 import { INotebookContentProvider } from './types';
 
 const EditorAssociationUpdatedKey = 'EditorAssociationUpdatedToUseNotebooks';
@@ -36,7 +35,6 @@ export class NotebookIntegration implements IExtensionSingleActivationService {
         @inject(IDisposableRegistry) private readonly disposables: IDisposableRegistry,
         @inject(INotebookContentProvider) private readonly notebookContentProvider: INotebookContentProvider,
         @inject(VSCodeKernelPickerProvider) private readonly kernelProvider: VSCodeKernelPickerProvider,
-        @inject(NotebookOutputRenderer) private readonly renderer: NotebookOutputRenderer,
         @inject(IApplicationEnvironment) private readonly env: IApplicationEnvironment,
         @inject(IApplicationShell) private readonly shell: IApplicationShell,
         @inject(IWorkspaceService) private readonly workspace: IWorkspaceService,
@@ -66,34 +64,6 @@ export class NotebookIntegration implements IExtensionSingleActivationService {
                     this.kernelProvider
                 )
             );
-            this.disposables.push(
-                this.vscNotebook.registerNotebookOutputRenderer(
-                    'jupyter-notebook-renderer',
-                    {
-                        mimeTypes: [
-                            'application/geo+json',
-                            'application/vdom.v1+json',
-                            'application/vnd.dataresource+json',
-                            'application/vnd.plotly.v1+json',
-                            'application/vnd.vega.v2+json',
-                            'application/vnd.vega.v3+json',
-                            'application/vnd.vega.v4+json',
-                            'application/vnd.vega.v5+json',
-                            'application/vnd.vegalite.v1+json',
-                            'application/vnd.vegalite.v2+json',
-                            'application/vnd.vegalite.v3+json',
-                            'application/vnd.vegalite.v4+json',
-                            'application/x-nteract-model-debug+json',
-                            'image/gif',
-                            'image/png',
-                            'image/jpeg',
-                            'text/latex',
-                            'text/vnd.plotly.v1+html'
-                        ]
-                    },
-                    this.renderer
-                )
-            );
         } catch (ex) {
             // If something goes wrong, and we're not in Insiders & not using the NativeEditor experiment, then swallow errors.
             traceError('Failed to register VS Code Notebook API', ex);

src/client/datascience/notebook/integration.ts

@@ -3,7 +3,7 @@
 
 'use strict';
 
-import { CellKind, ConfigurationTarget, Event, EventEmitter, Uri, WebviewPanel } from 'vscode';
+import { ConfigurationTarget, Event, EventEmitter, Uri, WebviewPanel } from 'vscode';
 import type { NotebookDocument } from 'vscode-proposed';
 import { IApplicationShell, ICommandManager, IVSCodeNotebook } from '../../common/application/types';
 import { traceError } from '../../common/logger';
@@ -23,6 +23,8 @@ import {
     IStatusProvider
 } from '../types';
 import { getDefaultCodeLanguage } from './helpers/helpers';
+// tslint:disable-next-line: no-var-requires no-require-imports
+const vscodeNotebookEnums = require('vscode') as typeof import('vscode-proposed');
 
 export class NotebookEditor implements INotebookEditor {
     public readonly type = 'native';
@@ -128,7 +130,14 @@ export class NotebookEditor implements INotebookEditor {
         const defaultLanguage = getDefaultCodeLanguage(this.model);
         this.vscodeNotebook.activeNotebookEditor.edit((editor) => {
             const totalLength = this.document.cells.length;
-            editor.insert(this.document.cells.length, '', defaultLanguage, CellKind.Code, [], undefined);
+            editor.insert(
+                this.document.cells.length,
+                '',
+                defaultLanguage,
+                vscodeNotebookEnums.CellKind.Code,
+                [],
+                undefined
+            );
             for (let i = totalLength - 1; i >= 0; i = i - 1) {
                 editor.delete(i);
             }

src/client/datascience/notebook/notebookEditor.ts

@@ -11,7 +11,6 @@ import { NotebookContentProvider } from './contentProvider';
 import { NotebookIntegration } from './integration';
 import { VSCodeKernelPickerProvider } from './kernelProvider';
 import { NotebookDisposeService } from './notebookDisposeService';
-import { NotebookOutputRenderer } from './renderer';
 import { NotebookSurveyBanner, NotebookSurveyDataLogger } from './survey';
 import { INotebookContentProvider } from './types';
 
@@ -27,7 +26,6 @@ export function registerTypes(serviceManager: IServiceManager) {
     );
     serviceManager.addSingleton<NotebookIntegration>(NotebookIntegration, NotebookIntegration);
     serviceManager.addSingleton<IKernelProvider>(IKernelProvider, KernelProvider);
-    serviceManager.addSingleton<NotebookOutputRenderer>(NotebookOutputRenderer, NotebookOutputRenderer);
     serviceManager.addSingleton<NotebookSurveyBanner>(NotebookSurveyBanner, NotebookSurveyBanner);
     serviceManager.addSingleton<VSCodeKernelPickerProvider>(VSCodeKernelPickerProvider, VSCodeKernelPickerProvider);
     serviceManager.addSingleton<IExtensionSingleActivationService>(