Skip to content

Commit 09dd5fe

Browse files
committed
Delete local storage patch
The main goal of this patch was to make user settings stored on disk instead of in the browser, but this stopped working some time ago. Not only that but it is causing a bug where a workspace will not fully open. A secondary goal was to fix the Vim extension but the extension appears to work just fine without this change now (both the server and browser versions). This patch is not useful anymore anyway because there are remote-level settings that *do* get stored on disk and can be used instead of user-level settings when necessary. Fixes #3061, and possibly #6153.
1 parent 958c520 commit 09dd5fe

File tree

5 files changed

+15
-82
lines changed

5 files changed

+15
-82
lines changed

patches/disable-downloads.diff

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
1414
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
15-
@@ -281,6 +281,11 @@ export interface IWorkbenchConstructionO
15+
@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionO
1616
*/
17-
readonly userDataPath?: string
17+
readonly configurationDefaults?: Record<string, any>;
1818

1919
+ /**
2020
+ * Whether the "Download..." option is enabled for files.
@@ -40,9 +40,9 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4040
* Gets whether a resolver extension is expected for the environment.
4141
*/
4242
readonly expectsResolverExtension: boolean;
43-
@@ -111,6 +116,13 @@ export class BrowserWorkbenchEnvironment
44-
return this.options.userDataPath;
45-
}
43+
@@ -110,6 +115,13 @@ export class BrowserWorkbenchEnvironment
44+
@memoize
45+
get cacheHome(): URI { return joinPath(this.userRoamingDataHome, 'caches'); }
4646

4747
+ get isEnabledFileDownloads(): boolean {
4848
+ if (typeof this.options.isEnabledFileDownloads === "undefined") {
@@ -52,7 +52,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
5252
+ }
5353
+
5454
@memoize
55-
get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
55+
get workspaceStorageHome(): URI { return joinPath(this.userRoamingDataHome, 'workspaceStorage'); }
5656

5757
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
5858
===================================================================
@@ -78,10 +78,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
8080
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
81-
@@ -332,6 +332,7 @@ export class WebClientServer {
81+
@@ -331,6 +331,7 @@ export class WebClientServer {
82+
const workbenchWebConfiguration = {
8283
remoteAuthority,
8384
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
84-
userDataPath: this._environmentService.userDataPath,
8585
+ isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
8686
_wrapWebWorkerExtHostInIframe,
8787
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },

patches/display-language.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
220220
import { CharCode } from 'vs/base/common/charCode';
221221
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
222222
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
223-
@@ -344,6 +345,8 @@ export class WebClientServer {
223+
@@ -343,6 +344,8 @@ export class WebClientServer {
224224
callbackRoute: this._callbackRoute
225225
};
226226

@@ -229,7 +229,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
229229
const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
230230
const values: { [key: string]: string } = {
231231
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
232-
@@ -352,6 +355,7 @@ export class WebClientServer {
232+
@@ -351,6 +354,7 @@ export class WebClientServer {
233233
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
234234
BASE: base,
235235
VS_BASE: vscodeBase,

patches/getting-started.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
135135
===================================================================
136136
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
137137
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
138-
@@ -286,6 +286,11 @@ export interface IWorkbenchConstructionO
138+
@@ -281,6 +281,11 @@ export interface IWorkbenchConstructionO
139139
*/
140140
readonly isEnabledFileDownloads?: boolean
141141

@@ -163,7 +163,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
163163
* Gets whether a resolver extension is expected for the environment.
164164
*/
165165
readonly expectsResolverExtension: boolean;
166-
@@ -123,6 +128,13 @@ export class BrowserWorkbenchEnvironment
166+
@@ -122,6 +127,13 @@ export class BrowserWorkbenchEnvironment
167167
return this.options.isEnabledFileDownloads;
168168
}
169169

@@ -175,7 +175,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
175175
+ }
176176
+
177177
@memoize
178-
get argvResource(): URI { return joinPath(this.userRoamingDataHome, 'argv.json'); }
178+
get workspaceStorageHome(): URI { return joinPath(this.userRoamingDataHome, 'workspaceStorage'); }
179179

180180
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
181181
===================================================================
@@ -201,9 +201,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
201201
===================================================================
202202
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
203203
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
204-
@@ -335,6 +335,7 @@ export class WebClientServer {
204+
@@ -334,6 +334,7 @@ export class WebClientServer {
205+
remoteAuthority,
205206
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
206-
userDataPath: this._environmentService.userDataPath,
207207
isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
208208
+ isEnabledCoderGettingStarted: !this._environmentService.args['disable-getting-started-override'],
209209
_wrapWebWorkerExtHostInIframe,

patches/local-storage.diff

-66
This file was deleted.

patches/series

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ logout.diff
1010
store-socket.diff
1111
proxy-uri.diff
1212
unique-db.diff
13-
local-storage.diff
1413
service-worker.diff
1514
sourcemaps.diff
1615
disable-downloads.diff

0 commit comments

Comments
 (0)