Simplifies timeline paging options

Eric Amodio · Eric Amodio · commit 5391a481bc8c · 2020-03-23T13:49:44.000-04:00
diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts
@@ -136,10 +136,8 @@ export class GitTimelineProvider implements TimelineProvider {
 			// sortByAuthorDate: true
 		});
 
-		const more = limit === undefined ? false : commits.length >= limit;
 		const paging = commits.length ? {
-			more: more,
-			cursor: more ? commits[commits.length - 1]?.hash : undefined
+			cursor: limit === undefined ? undefined : (commits.length >= limit ? commits[commits.length - 1]?.hash : undefined)
 		} : undefined;
 
 		// If we asked for an extra commit, strip it off
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -1895,13 +1895,9 @@ declare module 'vscode' {
 		readonly paging?: {
 			/**
 			 * A provider-defined cursor specifing the starting point of timeline items which are after the ones returned.
+			 * Use `undefined` to signal that there are no more items to be returned.
 			 */
-			readonly cursor?: string
-
-			/**
-			 * A flag which indicates whether there are more items that weren't returned.
-			 */
-			readonly more?: boolean;
+			readonly cursor: string | undefined;
 		}
 
 		/**
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -88,7 +88,6 @@ class TimelineAggregate {
 		this.source = timeline.source;
 		this.items = timeline.items;
 		this._cursor = timeline.paging?.cursor;
-		this._more = timeline.paging?.more ?? false;
 		this.lastRenderedIndex = -1;
 	}
 
@@ -97,9 +96,8 @@ class TimelineAggregate {
 		return this._cursor;
 	}
 
-	private _more: boolean;
 	get more(): boolean {
-		return this._more;
+		return this._cursor !== undefined;
 	}
 
 	get newest(): TimelineItem | undefined {
@@ -150,7 +148,6 @@ class TimelineAggregate {
 		}
 
 		this._cursor = timeline.paging?.cursor;
-		this._more = timeline.paging?.more ?? false;
 
 		if (updated) {
 			this.items.sort(
diff --git a/src/vs/workbench/contrib/timeline/common/timeline.ts b/src/vs/workbench/contrib/timeline/common/timeline.ts
@@ -54,8 +54,7 @@ export interface Timeline {
 	items: TimelineItem[];
 
 	paging?: {
-		cursor?: string
-		more?: boolean;
+		cursor: string | undefined;
 	}
 }
 
diff --git a/src/vs/workbench/contrib/timeline/common/timelineService.ts b/src/vs/workbench/contrib/timeline/common/timelineService.ts
@@ -58,8 +58,7 @@ export class TimelineService implements ITimelineService {
 		// 					}
 		// 				],
 		// 				paging: {
-		// 					cursor: 'next',
-		// 					more: true
+		// 					cursor: 'next'
 		// 				}
 		// 			});
 		// 		}
@@ -84,7 +83,7 @@ export class TimelineService implements ITimelineService {
 		// 				}
 		// 			],
 		// 			paging: {
-		// 				more: false
+		// 				cursor: undefined
 		// 			}
 		// 		});
 		// 	},

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ class TimelineAggregate {`
`88`	`88`	`this.source = timeline.source;`
`89`	`89`	`this.items = timeline.items;`
`90`	`90`	`this._cursor = timeline.paging?.cursor;`
`91`		`- this._more = timeline.paging?.more ?? false;`
`92`	`91`	`this.lastRenderedIndex = -1;`
`93`	`92`	`}`
`94`	`93`
`@@ -97,9 +96,8 @@ class TimelineAggregate {`
`97`	`96`	`return this._cursor;`
`98`	`97`	`}`
`99`	`98`
`100`		`- private _more: boolean;`
`101`	`99`	`get more(): boolean {`
`102`		`- return this._more;`
	`100`	`+ return this._cursor !== undefined;`
`103`	`101`	`}`
`104`	`102`
`105`	`103`	`get newest(): TimelineItem \| undefined {`
`@@ -150,7 +148,6 @@ class TimelineAggregate {`
`150`	`148`	`}`
`151`	`149`
`152`	`150`	`this._cursor = timeline.paging?.cursor;`
`153`		`- this._more = timeline.paging?.more ?? false;`
`154`	`151`
`155`	`152`	`if (updated) {`
`156`	`153`	`this.items.sort(`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ export interface Timeline {`
`54`	`54`	`items: TimelineItem[];`
`55`	`55`
`56`	`56`	`paging?: {`
`57`		`- cursor?: string`
`58`		`- more?: boolean;`
	`57`	`+ cursor: string \| undefined;`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`