Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

src/vs/workbench/services/extensions/common/extensionDevOptions.ts

@@ -1,6 +1,6 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
 import { Schemas } from 'vs/base/common/network';

src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts

@@ -8,6 +8,7 @@ import { TernarySearchTree } from 'vs/base/common/map';
 import { realpathSync } from 'vs/base/node/extfs';
 import { IExtensionHostProfile, IExtensionService, ProfileSegmentId, ProfileSession } from 'vs/workbench/services/extensions/common/extensions';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
+import { withNullAsUndefined } from 'vs/base/common/types';
 
 export class ExtensionHostProfiler {
 
@@ -88,7 +89,7 @@ export class ExtensionHostProfiler {
 					distilledIds.push(currSegmentId);
 					distilledDeltas.push(currSegmentTime);
 				}
-				currSegmentId = segmentId || undefined;
+				currSegmentId = withNullAsUndefined(segmentId);
 				currSegmentTime = 0;
 			}
 			currSegmentTime += timeDeltas[i];

src/vs/workbench/services/extensions/node/extensionHostProcess.ts

@@ -23,7 +23,7 @@ import { exit, ExtensionHostMain } from 'vs/workbench/services/extensions/node/e
 	const Module = require.__$__nodeRequire('module') as any;
 	const originalLoad = Module._load;
 
-	Module._load = function (request) {
+	Module._load = function (request: string) {
 		if (request === 'natives') {
 			throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');
 		}

src/vs/workbench/services/extensions/node/lazyPromise.ts

@@ -83,7 +83,7 @@ export class LazyPromise implements Promise<any> {
 		return this._ensureActual().then(undefined, error);
 	}
 
-	public finally(callback): any {
+	public finally(callback: () => void): any {
 		return this._ensureActual().finally(callback);
 	}
 }