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

clean up for https://github.com/microsoft/vscode/issues/101282

Browse Source
This commit is contained in:
Johannes Rieken
2020-08-17 10:53:57 +02:00
parent 6ea5e58c23
commit 442e27637d
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,7 +934,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
private _documentsAndEditors: ExtHostDocumentsAndEditors,
private readonly _webviewInitData: WebviewInitData,
private readonly logService: ILogService,
private readonly _extensionStoragePaths?: IExtensionStoragePaths,
private readonly _extensionStoragePaths: IExtensionStoragePaths,
) {
this._proxy = mainContext.getProxy(MainContext.MainThreadNotebook);
@@ -1175,11 +1175,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
return;
}
let storageRoot: URI | undefined;
if (this._extensionStoragePaths) {
storageRoot = this._extensionStoragePaths.workspaceValue(provider.extension) ?? this._extensionStoragePaths.globalValue(provider.extension);
}
const storageRoot = this._extensionStoragePaths.workspaceValue(provider.extension) ?? this._extensionStoragePaths.globalValue(provider.extension);
let document = this._documents.get(revivedUri);
if (!document) {
@@ -1547,10 +1543,8 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
const revivedUri = URI.revive(modelData.uri);
const viewType = modelData.viewType;
const entry = this._notebookContentProviders.get(viewType);
let storageRoot: URI | undefined;
if (entry && this._extensionStoragePaths) {
storageRoot = this._extensionStoragePaths.workspaceValue(entry.extension) ?? this._extensionStoragePaths.globalValue(entry.extension);
}
const storageRoot = entry && (this._extensionStoragePaths.workspaceValue(entry.extension) ?? this._extensionStoragePaths.globalValue(entry.extension));
if (!this._documents.has(revivedUri)) {
const that = this;