@@ -21,8 +21,12 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
2121 import product from 'vs/platform/product/common/product';
2222 import * as perf from 'vs/base/common/performance';
2323
24- @@ -33,37 +33,42 @@ const errorReporter: ErrorReporter = {
25- }
24+ @@ -30,41 +30,46 @@ const errorReporter: ErrorReporter = {
25+
26+ onDeprecatedOption: (deprecatedOption: string, message) => {
27+ console.warn(`Option '${deprecatedOption}' is deprecated: ${message}`);
28+ - }
29+ + },
2630 };
2731
2832- const args = parseArgs(process.argv.slice(2), serverOptions, errorReporter);
@@ -34,14 +38,15 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
3438- const USER_DATA_PATH = join(REMOTE_DATA_FOLDER, 'data');
3539- const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
3640- const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
41+ - const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
3742- const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
3843- args['user-data-dir'] = USER_DATA_PATH;
3944- const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
4045- const BUILTIN_EXTENSIONS_FOLDER_PATH = join(APP_ROOT, 'extensions');
4146- args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
4247- args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
4348-
44- - [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME].forEach(f => {
49+ - [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME ].forEach(f => {
4550- try {
4651- if (!fs.existsSync(f)) {
4752- fs.mkdirSync(f, { mode: 0o700 });
@@ -53,21 +58,22 @@ Index: code-server/lib/vscode/src/vs/server/node/server.main.ts
5358+ const USER_DATA_PATH = args['user-data-dir'] || join(REMOTE_DATA_FOLDER, 'data');
5459+ const APP_SETTINGS_HOME = join(USER_DATA_PATH, 'User');
5560+ const GLOBAL_STORAGE_HOME = join(APP_SETTINGS_HOME, 'globalStorage');
61+ + const LOCAL_HISTORY_HOME = join(APP_SETTINGS_HOME, 'History');
5662+ const MACHINE_SETTINGS_HOME = join(USER_DATA_PATH, 'Machine');
5763+ args['user-data-dir'] = USER_DATA_PATH;
5864+ const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
5965+ const BUILTIN_EXTENSIONS_FOLDER_PATH = args['builtin-extensions-dir'] || join(APP_ROOT, 'extensions');
6066+ args['builtin-extensions-dir'] = BUILTIN_EXTENSIONS_FOLDER_PATH;
6167+ args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'extensions');
6268+
63- + [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME].forEach(f => {
69+ + [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME ].forEach(f => {
6470+ try {
6571+ if (!fs.existsSync(f)) {
6672+ fs.mkdirSync(f, { mode: 0o700 });
6773+ }
6874+ } catch (err) { console.error(err); }
6975+ });
70- + return REMOTE_DATA_FOLDER
76+ + return REMOTE_DATA_FOLDER;
7177+ }
7278
7379 /**
@@ -261,9 +267,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
261267===================================================================
262268--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
263269+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
264- @@ -279 ,6 +279 ,7 @@ export class WebClientServer {
265- developmentOptions: { enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined } ,
266- settingsSyncOptions: ! this._environmentService.isBuilt && this._environmentService. args['enable-sync'] ? { enabled: true } : undefined ,
270+ @@ -285 ,6 +285 ,7 @@ export class WebClientServer {
271+ folderUri: resolveWorkspaceURI( this._environmentService.args['default-folder']) ,
272+ workspaceUri: resolveWorkspaceURI( this._environmentService.args['default-workspace']) ,
267273 productConfiguration: <Partial<IProductConfiguration>>{
268274+ codeServerVersion: this._productService.codeServerVersion,
269275 embedderIdentifier: 'server-distro',
0 commit comments