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

disposables

Browse Source
This commit is contained in:
rebornix
2020-02-24 10:35:08 -08:00
parent 8e6f63b345
commit 22ffffb16c
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/workbench/api/common/extHostNotebook.ts
View File

@@ -151,7 +151,7 @@ export class ExtHostCell implements vscode.NotebookCell {
}
export class ExtHostNotebookDocument implements vscode.NotebookDocument {
export class ExtHostNotebookDocument implements vscode.NotebookDocument, vscode.Disposable {
private static _handlePool: number = 0;
readonly handle = ExtHostNotebookDocument._handlePool++;
@@ -221,6 +221,9 @@ export class ExtHostNotebookDocument implements vscode.NotebookDocument {
) {
}
dispose() {
this._cellDisposableMapping.forEach(cell => cell.dispose());
}
get fileName() { return this.uri.fsPath; }
@@ -425,8 +428,9 @@ export class ExtHostNotebookDocument implements vscode.NotebookDocument {
}
}
export class ExtHostNotebookEditor implements vscode.NotebookEditor {
export class ExtHostNotebookEditor implements vscode.NotebookEditor, vscode.Disposable {
private _viewColumn: vscode.ViewColumn | undefined;
private _disposableStore = new DisposableStore();
constructor(
viewType: string,
@@ -435,7 +439,7 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
public document: ExtHostNotebookDocument,
private _documentsAndEditors: ExtHostDocumentsAndEditors
) {
this._documentsAndEditors.onDidAddDocuments(documents => {
this._disposableStore.add(this._documentsAndEditors.onDidAddDocuments(documents => {
for (const data of documents) {
let textDocument = data.document;
let parsedCellUri = parseCellUri(textDocument.uri);
@@ -455,9 +459,9 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
}
}
}
});
}));
this._documentsAndEditors.onDidRemoveDocuments(documents => {
this._disposableStore.add(this._documentsAndEditors.onDidRemoveDocuments(documents => {
for (const data of documents) {
let textDocument = data.document;
let parsedCellUri = parseCellUri(textDocument.uri);
@@ -477,7 +481,11 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
}
}
}
});
}));
}
dispose() {
this._disposableStore.dispose();
}
createCell(content: string, language: string, type: 'markdown' | 'code', outputs: vscode.CellOutput[]): vscode.NotebookCell {
@@ -739,12 +747,14 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
let document = this._documents.get(URI.revive(uri).toString());
if (document) {
document.dispose();
this._documents.delete(URI.revive(uri).toString());
}
let editor = this._editors.get(URI.revive(uri).toString());
if (editor) {
editor.dispose();
this._editors.delete(URI.revive(uri).toString());
}