mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-22 09:38:38 +01:00
execute cell
This commit is contained in:
rebornix
@@ -4,68 +4,136 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as vscode from 'vscode';
|
||||
import { ExtHostNotebookShape, IMainContext, MainThreadNotebookShape, MainContext } from 'vs/workbench/api/common/extHost.protocol';
|
||||
import { ExtHostNotebookShape, IMainContext, MainThreadNotebookShape, MainContext, MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protocol';
|
||||
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
|
||||
import { Disposable as VSCodeDisposable } from './extHostTypes';
|
||||
import { INotebook } from 'vs/editor/common/modes';
|
||||
import { URI } from 'vs/base/common/uri';
|
||||
import { DisposableStore } from 'vs/base/common/lifecycle';
|
||||
import { readonly } from 'vs/base/common/errors';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
// import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
|
||||
|
||||
export class ExtHostCell implements vscode.NotebookCell {
|
||||
|
||||
export class ExtHostCell implements vscode.ICell {
|
||||
private static _handlePool: number = 0;
|
||||
readonly handle = ExtHostCell._handlePool++;
|
||||
|
||||
source: string[];
|
||||
cell_type: 'markdown' | 'code';
|
||||
outputs: any[];
|
||||
public source: string[];
|
||||
private _outputs: any[];
|
||||
private _onDidChangeOutputs = new Emitter<void>();
|
||||
onDidChangeOutputs: Event<void> = this._onDidChangeOutputs.event;
|
||||
|
||||
constructor(
|
||||
raw_cell: vscode.ICell
|
||||
private _content: string,
|
||||
public cell_type: 'markdown' | 'code',
|
||||
public language: string,
|
||||
outputs: any[]
|
||||
) {
|
||||
this.source = raw_cell.source;
|
||||
this.cell_type = raw_cell.cell_type;
|
||||
this.outputs = raw_cell.outputs;
|
||||
this.source = this._content.split(/\r|\n|\r\n/g);
|
||||
this._outputs = outputs;
|
||||
}
|
||||
|
||||
get outputs() {
|
||||
return this._outputs;
|
||||
}
|
||||
|
||||
set outputs(newOutputs: any[]) {
|
||||
this._outputs = newOutputs;
|
||||
this._onDidChangeOutputs.fire();
|
||||
}
|
||||
|
||||
getContent(): string {
|
||||
throw new Error('Method not implemented.');
|
||||
}
|
||||
}
|
||||
|
||||
export class ExtHostNotebook implements vscode.INotebook {
|
||||
export class ExtHostNotebookDocument implements vscode.NotebookDocument {
|
||||
private static _handlePool: number = 0;
|
||||
readonly handle = ExtHostNotebook._handlePool++;
|
||||
public cells: ExtHostCell[];
|
||||
public cellMapping: Map<vscode.ICell, ExtHostCell> = new Map();
|
||||
readonly handle = ExtHostNotebookDocument._handlePool++;
|
||||
|
||||
constructor(
|
||||
public metadata: vscode.IMetadata,
|
||||
private raw_cells: vscode.ICell[]
|
||||
) {
|
||||
this.cells = raw_cells.map(cell => {
|
||||
let extHostCell = new ExtHostCell(cell);
|
||||
this.cellMapping.set(cell, extHostCell);
|
||||
return extHostCell;
|
||||
});
|
||||
private _cells: ExtHostCell[] = [];
|
||||
|
||||
get cells() {
|
||||
return this._cells;
|
||||
}
|
||||
|
||||
updateCells(newCells: vscode.ICell[]) {
|
||||
newCells.forEach(cell => {
|
||||
let extHostCell = this.cellMapping.get(cell);
|
||||
|
||||
if (extHostCell) {
|
||||
extHostCell.outputs = cell.outputs;
|
||||
}
|
||||
set cells(newCells: ExtHostCell[]) {
|
||||
this._cells = newCells;
|
||||
this._cells.forEach(cell => {
|
||||
cell.onDidChangeOutputs(() => {
|
||||
this._proxy.$updateNotebookCell(this.handle, {
|
||||
handle: cell.handle,
|
||||
source: cell.source,
|
||||
cell_type: cell.cell_type,
|
||||
outputs: cell.outputs
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// trigger update
|
||||
}
|
||||
|
||||
constructor(
|
||||
private readonly _proxy: MainThreadNotebookShape,
|
||||
public uri: URI
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
get fileName() { return this.uri.fsPath; }
|
||||
|
||||
async $updateCells(): Promise<void> {
|
||||
return await this._proxy.$updateNotebookCells(this.handle, this.cells.map(cell => ({
|
||||
handle: cell.handle,
|
||||
source: cell.source,
|
||||
cell_type: cell.cell_type,
|
||||
outputs: cell.outputs
|
||||
})));
|
||||
}
|
||||
|
||||
getActiveCell(cellHandle: number) {
|
||||
return this.cells.find(cell => cell.handle === cellHandle);
|
||||
}
|
||||
}
|
||||
|
||||
export class ExtHostNotebookEditor implements vscode.NotebookEditor {
|
||||
private _viewColumn: vscode.ViewColumn | undefined;
|
||||
|
||||
constructor(
|
||||
private readonly _proxy: MainThreadNotebookShape,
|
||||
readonly id: string,
|
||||
public uri: URI,
|
||||
public document: ExtHostNotebookDocument,
|
||||
private readonly documentsProxy: MainThreadDocumentsShape
|
||||
) {
|
||||
}
|
||||
|
||||
createCell(content: string, language: string, type: 'markdown' | 'code', outputs: vscode.CellOutput[]): vscode.NotebookCell {
|
||||
let cell = new ExtHostCell(content, type, language, outputs);
|
||||
return cell;
|
||||
}
|
||||
|
||||
get viewColumn(): vscode.ViewColumn | undefined {
|
||||
return this._viewColumn;
|
||||
}
|
||||
|
||||
set viewColumn(value) {
|
||||
throw readonly('viewColumn');
|
||||
}
|
||||
}
|
||||
|
||||
export class ExtHostNotebookController implements ExtHostNotebookShape {
|
||||
private static _handlePool: number = 0;
|
||||
|
||||
private readonly _proxy: MainThreadNotebookShape;
|
||||
private readonly _documentsProxy: MainThreadDocumentsShape;
|
||||
private readonly _notebookProviders = new Map<string, { readonly provider: vscode.NotebookProvider, readonly extension: IExtensionDescription }>();
|
||||
private readonly _notebookCache = new Map<string, ExtHostNotebook>();
|
||||
private readonly _localStore = new DisposableStore();
|
||||
private readonly _documents = new Map<string, ExtHostNotebookDocument>();
|
||||
|
||||
|
||||
constructor(mainContext: IMainContext) {
|
||||
this._proxy = mainContext.getProxy(MainContext.MainThreadNotebook);
|
||||
this._documentsProxy = mainContext.getProxy(MainContext.MainThreadDocuments);
|
||||
|
||||
}
|
||||
|
||||
public registerNotebookProvider(
|
||||
@@ -80,38 +148,30 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
|
||||
|
||||
this._notebookProviders.set(viewType, { extension, provider });
|
||||
this._proxy.$registerNotebookProvider({ id: extension.identifier, location: extension.extensionLocation }, viewType);
|
||||
|
||||
if (provider.onDidChangeNotebook) {
|
||||
this._localStore.add(provider.onDidChangeNotebook!((e) => {
|
||||
let resource = e.resource;
|
||||
let notebook = e.notebook;
|
||||
|
||||
let cachedNotebook = this._notebookCache.get(resource.toString());
|
||||
|
||||
if (cachedNotebook) {
|
||||
cachedNotebook.updateCells(notebook.cells);
|
||||
|
||||
this._proxy.$updateNotebook(viewType, resource, cachedNotebook);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
return new VSCodeDisposable(() => {
|
||||
this._notebookProviders.delete(viewType);
|
||||
this._proxy.$unregisterNotebookProvider(viewType);
|
||||
});
|
||||
}
|
||||
|
||||
async $resolveNotebook(viewType: string, uri: URI): Promise<INotebook | undefined> {
|
||||
async $resolveNotebook(viewType: string, uri: URI): Promise<number | undefined> {
|
||||
let provider = this._notebookProviders.get(viewType);
|
||||
|
||||
if (provider) {
|
||||
let notebook = await provider.provider.resolveNotebook(uri);
|
||||
if (notebook) {
|
||||
let extHostNotebook = new ExtHostNotebook(notebook.metadata, notebook.cells);
|
||||
this._notebookCache.set(uri.toString(), extHostNotebook);
|
||||
return extHostNotebook;
|
||||
if (!this._documents.has(URI.revive(uri).toString())) {
|
||||
let document = new ExtHostNotebookDocument(this._proxy, uri);
|
||||
await this._proxy.$createNotebookDocument(
|
||||
document.handle,
|
||||
uri
|
||||
);
|
||||
|
||||
this._documents.set(URI.revive(uri).toString(), document);
|
||||
}
|
||||
|
||||
let editor = new ExtHostNotebookEditor(this._proxy, `${ExtHostNotebookController._handlePool++}`, uri, this._documents.get(URI.revive(uri).toString())!, this._documentsProxy);
|
||||
await provider.provider.resolveNotebook(editor);
|
||||
await editor.document.$updateCells();
|
||||
return editor.document.handle;
|
||||
}
|
||||
|
||||
return Promise.resolve(undefined);
|
||||
@@ -121,7 +181,22 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
|
||||
let provider = this._notebookProviders.get(viewType);
|
||||
|
||||
if (provider) {
|
||||
return provider.provider.executeNotebook(uri);
|
||||
// return provider.provider.executeNotebook(uri);
|
||||
}
|
||||
}
|
||||
|
||||
async $executeNotebookCell(viewType: string, uri: URI, cellHandle: number): Promise<void> {
|
||||
let provider = this._notebookProviders.get(viewType);
|
||||
|
||||
if (provider) {
|
||||
let document = this._documents.get(URI.revive(uri).toString());
|
||||
let cell = document?.getActiveCell(cellHandle);
|
||||
|
||||
if (cell) {
|
||||
return provider.provider.executeCell(document!, cell!);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user