@@ -138,17 +138,25 @@ index e0ff793..885de12 100644
138
138
- const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
139
139
+ const cmdOrCtrlKey = browser.isMacintosh ? e.metaKey : e.ctrlKey;
140
140
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
141
- index 6fd8249..039d31a 100644
141
+ index 6fd8249..04c0933 100644
142
142
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
143
143
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
144
- @@ -50,0 +51 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
144
+ @@ -50,0 +51,2 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
145
145
+ import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
146
- @@ -120,0 +122,3 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
146
+ + import { mkdirp } from 'vs/base/node/pfs';
147
+ @@ -93,0 +96,8 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
148
+ + Promise.all<boolean | undefined>([ // Copied from src/vs/code/electron-main/main.ts
149
+ + environmentService.extensionsPath,
150
+ + environmentService.nodeCachedDataDir,
151
+ + environmentService.logsPath,
152
+ + environmentService.globalStorageHome,
153
+ + environmentService.workspaceStorageHome,
154
+ + environmentService.backupHome
155
+ + ].map((path): undefined | Promise<boolean> => path ? mkdirp(path) : undefined));
156
+ @@ -119,0 +130,2 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
147
157
+ const backupMainService = instantiationService.createInstance(BackupMainService) as BackupMainService;
148
158
+ backupMainService.initialize().catch(console.error);
149
- +
150
- @@ -223,0 +228,2 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo
151
- +
159
+ @@ -223,0 +236 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo
152
160
+ startup({ machineId: "1" });
153
161
diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
154
162
index f97a692..0206957 100644
0 commit comments