Merge from vscode 011858832762aaff245b2336fb1c38166e7a10fb (#4663)

src/vs/workbench/test/electron-browser/textsearch.perf.integrationTest.ts

@@ -97,15 +97,15 @@ suite.skip('TextSearch performance (integration)', () => {
 
 					telemetryService.events = [];
 
-					resolve(resultsFinishedEvent);
+					resolve!(resultsFinishedEvent);
 				} catch (e) {
 					// Fail the runSearch() promise
-					error(e);
+					error!(e);
 				}
 			}
 
-			let resolve;
-			let error;
+			let resolve: (result: any) => void;
+			let error: (error: Error) => void;
 			return new Promise((_resolve, _error) => {
 				resolve = _resolve;
 				error = _error;
@@ -122,9 +122,9 @@ suite.skip('TextSearch performance (integration)', () => {
 			.then(() => {
 				if (testWorkspaceArg) { // Don't measure by default
 					let i = n;
-					return (function iterate() {
+					return (function iterate(): Promise<undefined> | undefined {
 						if (!i--) {
-							return;
+							return undefined;
 						}
 
 						return runSearch()
@@ -133,11 +133,12 @@ suite.skip('TextSearch performance (integration)', () => {
 								finishedEvents.push(resultsFinishedEvent);
 								return iterate();
 							});
-					})().then(() => {
+					})()!.then(() => {
 						const totalTime = finishedEvents.reduce((sum, e) => sum + e.data.duration, 0);
 						console.log(`Avg duration: ${totalTime / n / 1000}s`);
 					});
 				}
+				return undefined;
 			});
 	});
 });