From 6f8fd621d2cd82b2f32954942edf9afe49b6ee7a Mon Sep 17 00:00:00 2001 From: rebornix Date: Fri, 14 Feb 2020 20:00:30 -0800 Subject: [PATCH] Errorless --- .../workbench/api/common/extHostNotebook.ts | 35 ++++++++----------- .../notebook/browser/notebookRegistry.ts | 4 +-- .../notebook/browser/output/outputRenderer.ts | 4 +-- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts index e20a7a68a05..69350b9c9d0 100644 --- a/src/vs/workbench/api/common/extHostNotebook.ts +++ b/src/vs/workbench/api/common/extHostNotebook.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { ExtHostNotebookShape, IMainContext, MainThreadNotebookShape, MainContext, MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol'; +import { ExtHostNotebookShape, IMainContext, MainThreadNotebookShape, MainContext } from 'vs/workbench/api/common/extHost.protocol'; import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; import { Disposable as VSCodeDisposable } from './extHostTypes'; import { URI } from 'vs/base/common/uri'; @@ -69,17 +69,17 @@ export class ExtHostCell implements vscode.NotebookCell { } } -const standardTransforms = [ - 'application/json', - 'application/javascript', - 'text/html', - 'image/svg+xml', - 'text/markdown', - 'image/svg+xml', - 'image/png', - 'image/jpeg', - 'text/plain' -]; +// const standardTransforms = [ +// 'application/json', +// 'application/javascript', +// 'text/html', +// 'image/svg+xml', +// 'text/markdown', +// 'image/svg+xml', +// 'image/png', +// 'image/jpeg', +// 'text/plain' +// ]; export class ExtHostNotebookDocument implements vscode.NotebookDocument { private static _handlePool: number = 0; @@ -258,12 +258,10 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor { private _viewColumn: vscode.ViewColumn | undefined; constructor( - private viewType: string, - private readonly _proxy: MainThreadNotebookShape, + viewType: string, readonly id: string, public uri: URI, public document: ExtHostNotebookDocument, - private readonly documentsProxy: MainThreadDocumentsShape, private _documentsAndEditors: ExtHostDocumentsAndEditors ) { let regex = new RegExp(`notebook\\+${viewType}-(\\d+)-(\\d+)`); @@ -375,7 +373,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN private static _handlePool: number = 0; private readonly _proxy: MainThreadNotebookShape; - private readonly _documentsProxy: MainThreadDocumentsShape; private readonly _notebookProviders = new Map(); private readonly _documents = new Map(); private readonly _editors = new Map(); @@ -384,8 +381,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN constructor(mainContext: IMainContext, private _documentsAndEditors: ExtHostDocumentsAndEditors) { this._proxy = mainContext.getProxy(MainContext.MainThreadNotebook); - this._documentsProxy = mainContext.getProxy(MainContext.MainThreadDocuments); - } private _activeNotebookDocument: ExtHostNotebookDocument | undefined; @@ -453,11 +448,11 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN let editor = new ExtHostNotebookEditor( viewType, - this._proxy, + // this._proxy, `${ExtHostNotebookController._handlePool++}`, uri, this._documents.get(URI.revive(uri).toString())!, - this._documentsProxy, + // this._documentsProxy, this._documentsAndEditors ); diff --git a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts index 7c0d4e3b9f9..6f5ebd9da9a 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts @@ -21,7 +21,7 @@ export namespace NotebookRegistry { } } -export function registerOutputTransform(id: string, types: string[], ctor: { new(handler: INotebookEditor, ...services: Services): IOutputTransformContribution }): void { +export function registerOutputTransform(id: string, types: string[], ctor: { new(editor: INotebookEditor, ...services: Services): IOutputTransformContribution }): void { NotebookRegistryImpl.INSTANCE.registerOutputTransform(id, types, ctor); } @@ -35,7 +35,7 @@ class NotebookRegistryImpl { this.outputTransforms = []; } - public registerOutputTransform(id: string, types: string[], ctor: { new(handler: INotebookEditor, ...services: Services): IOutputTransformContribution }): void { + public registerOutputTransform(id: string, types: string[], ctor: { new(editor: INotebookEditor, ...services: Services): IOutputTransformContribution }): void { this.outputTransforms.push({ id: id, types: types, ctor: ctor as IOutputTransformCtor }); } diff --git a/src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts b/src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts index 2480d00ce02..9c06ee6c863 100644 --- a/src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts +++ b/src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts @@ -14,7 +14,7 @@ export class OutputRenderer { protected readonly _mimeTypeMapping: { [key: string]: IOutputTransformContribution; }; constructor( - private readonly notebookHandler: INotebookEditor, + notebookEditor: INotebookEditor, private readonly instantiationService: IInstantiationService ) { this._contributions = {}; @@ -24,7 +24,7 @@ export class OutputRenderer { for (const desc of contributions) { try { - const contribution = this.instantiationService.createInstance(desc.ctor, notebookHandler); + const contribution = this.instantiationService.createInstance(desc.ctor, notebookEditor); this._contributions[desc.id] = contribution; desc.types.forEach(mimeType => { this._mimeTypeMapping[mimeType] = contribution; -- GitLab