Fixes microsoft#91677

Eric Amodio · Eric Amodio · commit 5acdde478f29 · 2020-02-27T11:23:45.000-05:00
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -251,7 +251,7 @@ export class TimelinePane extends ViewPane {
 					}
 
 					this._tree.setChildren(null, undefined);
-					this.message = localize('timeline.loading', 'Loading timeline for ${0}...', basename(uri.fsPath));
+					this.message = localize('timeline.loading', 'Loading timeline for {0}...', basename(uri.fsPath));
 				}, 500, this._uri);
 			}
 		}
@@ -291,7 +291,7 @@ export class TimelinePane extends ViewPane {
 			if (!reset) {
 				// TODO: Handle pending request
 
-				if (cursors?.more === false) {
+				if (cursors?.more !== true) {
 					continue;
 				}
 
@@ -306,6 +306,10 @@ export class TimelinePane extends ViewPane {
 					request?.tokenSource ?? new CancellationTokenSource(), { cacheResults: true }
 				)!;
 
+				if (request === undefined) {
+					continue;
+				}
+
 				this._pendingRequests.set(source, request);
 				if (!reusingToken) {
 					request.tokenSource.token.onCancellationRequested(() => this._pendingRequests.delete(source));
@@ -322,6 +326,10 @@ export class TimelinePane extends ViewPane {
 					new CancellationTokenSource(), { cacheResults: true }
 				)!;
 
+				if (request === undefined) {
+					continue;
+				}
+
 				this._pendingRequests.set(source, request);
 				request.tokenSource.token.onCancellationRequested(() => this._pendingRequests.delete(source));
 			}
