OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix workspace storage creation

Browse Source 
Fixes #1308.
This commit is contained in:
Asher 2020-02-25 12:47:22 -06:00
parent 4c6e4bedeb
commit f76c809f7d
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ci/vscode.patch
View File

@ -2676,7 +2676,7 @@ index a1c3e50ffd..910627aaf9 100644
throw new Error(`Cannot load URI: '${module}', must be of file-scheme`); throw new Error(`Cannot load URI: '${module}', must be of file-scheme`);
} }
diff --git a/src/vs/workbench/api/node/extHostStoragePaths.ts b/src/vs/workbench/api/node/extHostStoragePaths.ts diff --git a/src/vs/workbench/api/node/extHostStoragePaths.ts b/src/vs/workbench/api/node/extHostStoragePaths.ts
index afdd6bf398..604fdd255c 100644 index afdd6bf398..1633daf93d 100644
--- a/src/vs/workbench/api/node/extHostStoragePaths.ts --- a/src/vs/workbench/api/node/extHostStoragePaths.ts
+++ b/src/vs/workbench/api/node/extHostStoragePaths.ts +++ b/src/vs/workbench/api/node/extHostStoragePaths.ts
@@ -5,13 +5,14 @@ @@ -5,13 +5,14 @@
@ -2704,18 +2704,20 @@ index afdd6bf398..604fdd255c 100644
) { ) {
this._workspace = withNullAsUndefined(initData.workspace); this._workspace = withNullAsUndefined(initData.workspace);
this._environment = initData.environment; this._environment = initData.environment;
@@ -54,21 +56,25 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths { @@ -54,21 +56,26 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths {
const storageName = this._workspace.id; const storageName = this._workspace.id;
const storagePath = path.join(this._environment.appSettingsHome.fsPath, 'workspaceStorage', storageName); const storagePath = path.join(this._environment.appSettingsHome.fsPath, 'workspaceStorage', storageName);
- const exists = await pfs.dirExists(storagePath); - const exists = await pfs.dirExists(storagePath);
-
- if (exists) {
+ // NOTE@coder: Use the file system proxy so this will work in the browser. + // NOTE@coder: Use the file system proxy so this will work in the browser.
+ // writeFile performs a mkdirp so we don't need to bother ourselves.
+ const fileSystem = this._extHostRpc.getProxy(MainContext.MainThreadFileSystem); + const fileSystem = this._extHostRpc.getProxy(MainContext.MainThreadFileSystem);
+ const exists = fileSystem.$stat(URI.file(storagePath)); + try {
+ await fileSystem.$stat(URI.file(storagePath));
if (exists) {
return storagePath; return storagePath;
+ } catch (error) {
+ // Doesn't exist.
} }
try { try {
@ -2727,6 +2729,7 @@ index afdd6bf398..604fdd255c 100644
- configuration: this._workspace.configuration && URI.revive(this._workspace.configuration).toString(), - configuration: this._workspace.configuration && URI.revive(this._workspace.configuration).toString(),
- name: this._workspace.name - name: this._workspace.name
- }, undefined, 2) - }, undefined, 2)
+ // NOTE@coder: $writeFile performs a mkdirp.
+ await fileSystem.$writeFile( + await fileSystem.$writeFile(
+ URI.file(path.join(storagePath, 'meta.json')), + URI.file(path.join(storagePath, 'meta.json')),
+ VSBuffer.fromString( + VSBuffer.fromString(