Some strict null checks in progressService

mjbvz · mjbvz · commit a62b481bdbf8 · 2019-01-10T11:57:04.000-08:00
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -65,7 +65,7 @@ export class ProgressService2 implements IProgressService2 {
 
 		const promise = callback(task[1]);
 
-		let delayHandle = setTimeout(() => {
+		let delayHandle: any = setTimeout(() => {
 			delayHandle = undefined;
 			this._stack.unshift(task);
 			this._updateWindowProgress();
@@ -131,7 +131,7 @@ export class ProgressService2 implements IProgressService2 {
 	private _withNotificationProgress<P extends Promise<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: () => void): P {
 		const toDispose: IDisposable[] = [];
 
-		const createNotification = (message: string, increment?: number): INotificationHandle => {
+		const createNotification = (message: string | undefined, increment?: number): INotificationHandle | undefined => {
 			if (!message) {
 				return undefined; // we need a message at least
 			}
@@ -140,7 +140,7 @@ export class ProgressService2 implements IProgressService2 {
 			if (options.cancellable) {
 				const cancelAction = new class extends Action {
 					constructor() {
-						super('progress.cancel', localize('cancel', "Cancel"), null, true);
+						super('progress.cancel', localize('cancel', "Cancel"), undefined, true);
 					}
 
 					run(): Promise<any> {
@@ -153,7 +153,7 @@ export class ProgressService2 implements IProgressService2 {
 				};
 				toDispose.push(cancelAction);
 
-				actions.primary.push(cancelAction);
+				actions.primary!.push(cancelAction);
 			}
 
 			const handle = this._notificationService.notify({
@@ -181,7 +181,7 @@ export class ProgressService2 implements IProgressService2 {
 			}
 		};
 
-		let handle: INotificationHandle;
+		let handle: INotificationHandle | undefined;
 		const updateNotification = (message?: string, increment?: number): void => {
 			if (!handle) {
 				handle = createNotification(message, increment);
@@ -235,7 +235,7 @@ export class ProgressService2 implements IProgressService2 {
 
 		// show activity bar
 		let activityProgress: IDisposable;
-		let delayHandle = setTimeout(() => {
+		let delayHandle: any = setTimeout(() => {
 			delayHandle = undefined;
 			const handle = this._activityBar.showActivity(
 				viewletId,
