Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 16:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

extract exthost/mainthread proxy kernels.

Browse Source
This commit is contained in:
rebornix
2022-04-14 11:10:48 -07:00
parent ec30263535
commit f20a0f2a10
10 changed files with 316 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/vs/workbench/api/common/extHostNotebookKernels.ts
View File

@@ -12,7 +12,7 @@ import { ResourceMap } from 'vs/base/common/map';
import { URI, UriComponents } from 'vs/base/common/uri';
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { ILogService } from 'vs/platform/log/common/log';
import { ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, IMainContext, INotebookKernelDto2, INotebookProxyKernelDto, MainContext, MainThreadNotebookKernelsShape, NotebookOutputDto } from 'vs/workbench/api/common/extHost.protocol';
import { ExtHostNotebookKernelsShape, ICellExecuteUpdateDto, IMainContext, INotebookKernelDto2, MainContext, MainThreadNotebookKernelsShape, NotebookOutputDto } from 'vs/workbench/api/common/extHost.protocol';
import { ApiCommand, ApiCommandArgument, ApiCommandResult, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';
import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebook';
@@ -34,13 +34,6 @@ interface IKernelData {
associatedNotebooks: ResourceMap<boolean>;
}
interface IProxyKernelData {
extensionId: ExtensionIdentifier;
controller: vscode.NotebookProxyController;
onDidChangeSelection: Emitter<{ selected: boolean; notebook: vscode.NotebookDocument }>;
associatedNotebooks: ResourceMap<boolean>;
}
type ExtHostSelectKernelArgs = ControllerInfo | { notebookEditor: vscode.NotebookEditor } | ControllerInfo & { notebookEditor: vscode.NotebookEditor } | undefined;
export type SelectKernelReturnArgs = ControllerInfo | { notebookEditorId: string } | ControllerInfo & { notebookEditorId: string } | undefined;
type ControllerInfo = { id: string; extension: string };
@@ -52,7 +45,6 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
private readonly _activeExecutions = new ResourceMap<NotebookCellExecutionTask>();
private readonly _kernelData = new Map<number, IKernelData>();
private readonly _proxyKernelData: Map<number, IProxyKernelData> = new Map<number, IProxyKernelData>();
private _handlePool: number = 0;
private readonly _onDidChangeCellExecutionState = new Emitter<vscode.NotebookCellExecutionStateChangeEvent>();
@@ -116,7 +108,7 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
const onDidReceiveMessage = new Emitter<{ editor: vscode.NotebookEditor; message: any }>();
const data: INotebookKernelDto2 = {
id: createKernelId(extension, id),
id: createKernelId(extension.identifier, id),
notebookType: viewType,
extensionId: extension.identifier,
extensionLocation: extension.extensionLocation,
@@ -226,7 +218,7 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
that._logService.trace(`NotebookController[${handle}] NOT associated to notebook, associated to THESE notebooks:`, Array.from(associatedNotebooks.keys()).map(u => u.toString()));
throw new Error(`notebook controller is NOT associated to notebook: ${cell.notebook.uri.toString()}`);
}
return that._createNotebookCellExecution(cell, createKernelId(extension, this.id));
return that._createNotebookCellExecution(cell, createKernelId(extension.identifier, this.id));
},
dispose: () => {
if (!isDisposed) {
@@ -265,105 +257,18 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
return controller;
}
createNotebookProxyController(extension: IExtensionDescription, id: string, viewType: string, label: string, handler: () => vscode.NotebookController | string | Thenable<vscode.NotebookController | string>): vscode.NotebookProxyController {
const handle = this._handlePool++;
let isDisposed = false;
const commandDisposables = new DisposableStore();
const onDidChangeSelection = new Emitter<{ selected: boolean; notebook: vscode.NotebookDocument }>();
const data: INotebookProxyKernelDto = {
id: createKernelId(extension, id),
notebookType: viewType,
extensionId: extension.identifier,
extensionLocation: extension.extensionLocation,
label: label || extension.identifier.value,
};
let _resolveHandler = handler;
this._proxy.$addProxyKernel(handle, data).catch(err => {
// this can happen when a kernel with that ID is already registered
console.log(err);
isDisposed = true;
});
let tokenPool = 0;
const _update = () => {
if (isDisposed) {
return;
getIdByController(controller: vscode.NotebookController) {
// return this._kernelData.(data => data.controller === controller);
for (const [_, candidate] of this._kernelData) {
if (candidate.controller === controller) {
return createKernelId(candidate.extensionId, controller.id);
}
const myToken = ++tokenPool;
Promise.resolve().then(() => {
if (myToken === tokenPool) {
this._proxy.$updateProxyKernel(handle, data);
}
});
};
// notebook documents that are associated to this controller
const associatedNotebooks = new ResourceMap<boolean>();
const controller: vscode.NotebookProxyController = {
get id() { return id; },
get notebookType() { return data.notebookType; },
onDidChangeSelectedNotebooks: onDidChangeSelection.event,
get label() {
return data.label;
},
set label(value) {
data.label = value ?? extension.displayName ?? extension.name;
_update();
},
get detail() {
return data.detail ?? '';
},
set detail(value) {
data.detail = value;
_update();
},
get description() {
return data.description ?? '';
},
set description(value) {
data.description = value;
_update();
},
get kind() {
checkProposedApiEnabled(extension, 'notebookControllerKind');
return data.kind ?? '';
},
set kind(value) {
checkProposedApiEnabled(extension, 'notebookControllerKind');
data.kind = value;
_update();
},
get resolveHandler() {
return _resolveHandler;
},
dispose: () => {
if (!isDisposed) {
this._logService.trace(`NotebookController[${handle}], DISPOSED`);
isDisposed = true;
this._kernelData.delete(handle);
commandDisposables.dispose();
onDidChangeSelection.dispose();
this._proxy.$removeKernel(handle);
}
}
};
this._proxyKernelData.set(handle, {
extensionId: extension.identifier,
controller,
onDidChangeSelection,
associatedNotebooks
});
return controller;
}
return null;
}
$acceptNotebookAssociation(handle: number, uri: UriComponents, value: boolean): void {
const obj = this._kernelData.get(handle) ?? this._proxyKernelData.get(handle);
const obj = this._kernelData.get(handle);
if (obj) {
// update data structure
const notebook = this._extHostNotebook.getNotebookDocument(URI.revive(uri))!;
@@ -451,34 +356,6 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
}
}
async $resolveKernel(handle: number): Promise<string | null> {
const obj = this._proxyKernelData.get(handle);
if (!obj) {
// extension can dispose kernels in the meantime
return null;
}
const controller = await obj.controller.resolveHandler();
let matchedKernelData: IKernelData | undefined;
this._kernelData.forEach(d => {
if (typeof controller === 'string') {
if (d.controller.id === controller) {
matchedKernelData = d;
}
} else {
if (d.controller.id === controller.id) {
matchedKernelData = d;
}
}
});
if (matchedKernelData) {
return `${matchedKernelData.extensionId.value}/${matchedKernelData.controller.id}`;
}
return null;
}
// ---
_createNotebookCellExecution(cell: vscode.NotebookCell, controllerId: string): vscode.NotebookCellExecution {
@@ -716,6 +593,6 @@ class TimeoutBasedCollector<T> {
}
}
function createKernelId(extension: IExtensionDescription, id: string): string {
return `${extension.identifier.value}/${id}`;
export function createKernelId(extensionIdentifier: ExtensionIdentifier, id: string): string {
return `${extensionIdentifier.value}/${id}`;
}