@@ -318,7 +318,7 @@ index 67e34826627..7c5287d6a32 100644
318318 telemetry: this.telemetry,
319319 storageKey: ASSIGNMENT_STORAGE_KEY,
320320diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
321- index b3e423e20f9..58045b68058 100644
321+ index 63243fcf3a0..d948ee599cf 100644
322322--- a/src/vs/platform/environment/node/argv.ts
323323+++ b/src/vs/platform/environment/node/argv.ts
324324@@ -3,7 +3,7 @@
@@ -331,7 +331,7 @@ index b3e423e20f9..58045b68058 100644
331331 import { localize } from 'vs/nls';
332332 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
333333diff --git a/src/vs/platform/environment/node/argvHelper.ts b/src/vs/platform/environment/node/argvHelper.ts
334- index 74a7369225d..26e97cb6681 100644
334+ index d8cefb6df67..a94fca911ea 100644
335335--- a/src/vs/platform/environment/node/argvHelper.ts
336336+++ b/src/vs/platform/environment/node/argvHelper.ts
337337@@ -3,7 +3,7 @@
@@ -344,7 +344,7 @@ index 74a7369225d..26e97cb6681 100644
344344 import { localize } from 'vs/nls';
345345 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
346346diff --git a/src/vs/platform/files/node/diskFileSystemProvider.ts b/src/vs/platform/files/node/diskFileSystemProvider.ts
347- index 0142abfb605..a891dd16694 100644
347+ index 4ea7d28e214..71ae1c060b0 100644
348348--- a/src/vs/platform/files/node/diskFileSystemProvider.ts
349349+++ b/src/vs/platform/files/node/diskFileSystemProvider.ts
350350@@ -4,7 +4,6 @@
@@ -379,7 +379,7 @@ index 0142abfb605..a891dd16694 100644
379379 IFileSystemProviderWithFileReadWriteCapability,
380380 IFileSystemProviderWithOpenReadWriteCloseCapability,
381381diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
382- index af0e0cfe14c..30b6c87382e 100644
382+ index 053f3822d27..46fd5932bc5 100644
383383--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
384384+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
385385@@ -447,7 +447,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
@@ -389,7 +389,7 @@ index af0e0cfe14c..30b6c87382e 100644
389389- isAdmin = (await import('native-is-elevated'))();
390390+ isAdmin = (await import('native-is-elevated')).default();
391391 } else {
392- isAdmin = process.getuid() === 0;
392+ isAdmin = process.getuid?. () === 0;
393393 }
394394diff --git a/src/vs/platform/request/node/proxy.ts b/src/vs/platform/request/node/proxy.ts
395395index ee2aae8814b..7073eb1e548 100644
@@ -1406,18 +1406,18 @@ index 7ac17418689..fedd15e8fb6 100644
14061406 const deltaExtensions = this.extensions.set(remoteInitData.allExtensions, remoteInitData.myExtensions);
14071407 return {
14081408diff --git a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
1409- index 6360149dfce..e88ef0b288a 100644
1409+ index b72e19b9ec6..79278e098bb 100644
14101410--- a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
14111411+++ b/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts
1412- @@ -191 ,6 +191 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
1412+ @@ -190 ,6 +190 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
14131413 }
14141414
14151415 protected async _startWithCommunication<T>(communication: IExtHostCommunication<T>): Promise<IMessagePassingProtocol> {
14161416+ const initDataPromise = this._initDataProvider.getInitData();
14171417
14181418 const [extensionHostCreationResult, communicationPreparedData, portNumber, processEnv] = await Promise.all([
14191419 this._extensionHostStarter.createExtensionHost(),
1420- @@ -323 ,7 +324 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
1420+ @@ -325 ,7 +326 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
14211421
14221422 // Initialize extension host process with hand shakes
14231423 const protocol = await communication.establishProtocol(communicationPreparedData, this._extensionHostProcess, opts);
@@ -1426,7 +1426,7 @@ index 6360149dfce..e88ef0b288a 100644
14261426 clearTimeout(startupTimeoutHandle);
14271427 return protocol;
14281428 }
1429- @@ -358 ,7 +359 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
1429+ @@ -360 ,7 +361 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
14301430 return port || 0;
14311431 }
14321432
@@ -1435,7 +1435,7 @@ index 6360149dfce..e88ef0b288a 100644
14351435 // 1) wait for the incoming `ready` event and send the initialization data.
14361436 // 2) wait for the incoming `initialized` event.
14371437 return new Promise<void>((resolve, reject) => {
1438- @@ -383 ,7 +384 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
1438+ @@ -385 ,7 +386 ,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
14391439 // 1) Extension Host is ready to receive messages, initialize it
14401440 uninstallTimeoutCheck();
14411441
@@ -1444,7 +1444,7 @@ index 6360149dfce..e88ef0b288a 100644
14441444
14451445 // Wait 60s for the initialized message
14461446 installTimeoutCheck();
1447- @@ -412 ,8 +413 ,8 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
1447+ @@ -414 ,8 +415 ,8 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
14481448 });
14491449 }
14501450
0 commit comments