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

don't bind notebook document to a provider/extension, do then when calling backup, fixes https://github.com/microsoft/vscode/issues/117035

Browse Source
This commit is contained in:
Johannes Rieken
2021-02-19 14:25:41 +01:00
parent 7e7a71d733
commit 93ec7113e1
4 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/workbench/api/common/extHostNotebookDocument.ts
View File

@@ -4,10 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { Emitter, Event } from 'vs/base/common/event';
import { hash } from 'vs/base/common/hash';
import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
import { Schemas } from 'vs/base/common/network';
import { joinPath } from 'vs/base/common/resources';
import { URI } from 'vs/base/common/uri';
import { CellKind, INotebookDocumentPropertiesChangeData, MainThreadNotebookShape } from 'vs/workbench/api/common/extHost.protocol';
import { ExtHostDocumentsAndEditors, IExtHostModelAddedData } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
@@ -124,10 +122,6 @@ export interface INotebookEventEmitter {
emitCellMetadataChange(event: vscode.NotebookCellMetadataChangeEvent): void;
}
function hashPath(resource: URI): string {
const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : resource.toString();
return hash(str) + '';
}
export class ExtHostNotebookDocument extends Disposable {
@@ -139,11 +133,10 @@ export class ExtHostNotebookDocument extends Disposable {
private _cellDisposableMapping = new Map<number, DisposableStore>();
private _notebook: vscode.NotebookDocument | undefined;
private _versionId = 0;
private _isDirty = false;
private _backupCounter = 1;
private _versionId: number = 0;
private _isDirty: boolean = false;
private _backup?: vscode.NotebookDocumentBackup;
private _disposed = false;
private _disposed: boolean = false;
constructor(
private readonly _proxy: MainThreadNotebookShape,
@@ -152,8 +145,7 @@ export class ExtHostNotebookDocument extends Disposable {
private readonly _viewType: string,
private readonly _contentOptions: vscode.NotebookDocumentContentOptions,
private _metadata: extHostTypes.NotebookDocumentMetadata,
public readonly uri: URI,
private readonly _storagePath: URI | undefined
readonly uri: URI,
) {
super();
}
@@ -185,14 +177,6 @@ export class ExtHostNotebookDocument extends Disposable {
return this._notebook;
}
getNewBackupUri(): URI {
if (!this._storagePath) {
throw new Error('Backup requires a valid storage path');
}
const fileName = hashPath(this.uri) + (this._backupCounter++);
return joinPath(this._storagePath, fileName);
}
updateBackup(backup: vscode.NotebookDocumentBackup): void {
this._backup?.delete();
this._backup = backup;