mirror of https://github.com/coder/code-server.git
Use file system for settings and fix data home path
It's possible that using browser storage makes more sense with settings sync, so we might want to revisit this once/if we get settings sync working. As it currently is though, browser storage just causes jank. The path was also missing a `User` at the end so I added that. This might affect the Vim extension which would have been writing to the wrong path previously but I don't believe it should affect anything else since they would have been writing to browser storage. - Fixes #2208 - Fixes #2231 - Fixes #2279 - Fixes #2274
This commit is contained in:
parent
96170de191
commit
3d7fbec40f
|
@ -3797,18 +3797,25 @@ index 85d83f37da179a1e39266cf72a02e971f590308e..0659738b36df1747c9afcabf8d9abf26
|
||||||
};
|
};
|
||||||
|
|
||||||
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
|
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
|
||||||
index a8d43045ecc8cbe04b3f8440cff16d42aadbcad0..cd589c6f75eccbeefbf364d426ac882396b26fb4 100644
|
index a8d43045ecc8cbe04b3f8440cff16d42aadbcad0..8e122c761ac7ddfee11f9dda2ac5e845b893cc28 100644
|
||||||
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
|
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
|
||||||
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
|
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
|
||||||
@@ -119,8 +119,18 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
|
@@ -119,8 +119,25 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
|
||||||
@memoize
|
@memoize
|
||||||
get logFile(): URI { return joinPath(this.options.logsPath, 'window.log'); }
|
get logFile(): URI { return joinPath(this.options.logsPath, 'window.log'); }
|
||||||
|
|
||||||
+ // NOTE@coder: Use the regular path for extensions that write directly to disk
|
+ // NOTE@coder: Use the same path in // ../../../../platform/environment/node/environmentService.ts
|
||||||
+ // instead of using the VS Code API.
|
+ // and don't use the user data scheme. This solves two problems:
|
||||||
|
+ // 1. Extensions running in the browser (like Vim) might use these paths
|
||||||
|
+ // directly instead of using the file service and most likely can't write
|
||||||
|
+ // to `/User` on disk.
|
||||||
|
+ // 2. Settings will be stored in the file system instead of in browser
|
||||||
|
+ // storage. Using browser storage makes sharing or seeding settings
|
||||||
|
+ // between browsers difficult. We may want to revisit this once/if we get
|
||||||
|
+ // settings sync.
|
||||||
@memoize
|
@memoize
|
||||||
- get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.userData }); }
|
- get userRoamingDataHome(): URI { return URI.file('/User').with({ scheme: Schemas.userData }); }
|
||||||
+ get userRoamingDataHome(): URI { return URI.file(this.userDataPath).with({ scheme: Schemas.userData }); }
|
+ get userRoamingDataHome(): URI { return joinPath(URI.file(this.userDataPath).with({ scheme: Schemas.vscodeRemote }), 'User'); }
|
||||||
+ @memoize
|
+ @memoize
|
||||||
+ get userDataPath(): string {
|
+ get userDataPath(): string {
|
||||||
+ const dataPath = this.payload?.get("userDataPath");
|
+ const dataPath = this.payload?.get("userDataPath");
|
||||||
|
@ -3820,7 +3827,7 @@ index a8d43045ecc8cbe04b3f8440cff16d42aadbcad0..cd589c6f75eccbeefbf364d426ac8823
|
||||||
|
|
||||||
@memoize
|
@memoize
|
||||||
get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); }
|
get settingsResource(): URI { return joinPath(this.userRoamingDataHome, 'settings.json'); }
|
||||||
@@ -301,7 +311,12 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
|
@@ -301,7 +318,12 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment
|
||||||
extensionHostDebugEnvironment.params.port = parseInt(value);
|
extensionHostDebugEnvironment.params.port = parseInt(value);
|
||||||
break;
|
break;
|
||||||
case 'enableProposedApi':
|
case 'enableProposedApi':
|
||||||
|
|
Loading…
Reference in New Issue