Changes limit to take a cursor object — #91722

extensions/git/src/timelineProvider.ts

@@ -114,9 +114,9 @@ export class GitTimelineProvider implements TimelineProvider {
 		// TODO[ECA]: Ensure that the uri is a file -- if not we could get the history of the repo?
 
 		let limit: number | undefined;
-		if (typeof options.limit === 'string') {
+		if (options.limit !== undefined && typeof options.limit !== 'number') {
 			try {
-				const result = await this._model.git.exec(repo.root, ['rev-list', '--count', `${options.limit}..`, '--', uri.fsPath]);
+				const result = await this._model.git.exec(repo.root, ['rev-list', '--count', `${options.limit.cursor}..`, '--', uri.fsPath]);
 				if (!result.exitCode) {
 					// Ask for 1 more than so we can determine if there are more commits
 					limit = Number(result.stdout) + 1;

src/vs/vscode.proposed.d.ts

@@ -1600,7 +1600,7 @@ declare module 'vscode' {
 		/**
 		 * The maximum number or the ending cursor of timeline items that should be returned.
 		 */
-		limit?: number | string;
+		limit?: number | { cursor: string };
 	}
 
 	export interface TimelineProvider {

src/vs/workbench/contrib/timeline/browser/timelinePane.ts

@@ -80,8 +80,8 @@ interface TimelineActionContext {
 }
 
 interface TimelineCursors {
-	startCursors?: { before: any; after?: any };
-	endCursors?: { before: any; after?: any };
+	startCursors?: { before: string; after?: string };
+	endCursors?: { before: string; after?: string };
 	more: boolean;
 }
 
@@ -308,7 +308,9 @@ export class TimelinePane extends ViewPane {
 					{
 						cursor: options.before ? cursors?.startCursors?.before : (cursors?.endCursors ?? cursors?.startCursors)?.after,
 						...options,
-						limit: options.limit === 0 ? undefined : options.limit ?? defaultPageSize
+						limit: options.limit === 0
+							? undefined
+							: options.limit ?? defaultPageSize
 					},
 					request?.tokenSource ?? new CancellationTokenSource(), { cacheResults: true, resetCache: false }
 				)!;
@@ -329,7 +331,11 @@ export class TimelinePane extends ViewPane {
 					source, this._uri,
 					{
 						...options,
-						limit: options.limit === 0 ? undefined : (reset ? cursors?.endCursors?.after : undefined) ?? options.limit ?? defaultPageSize
+						limit: options.limit === 0
+							? undefined
+							: (reset && cursors?.endCursors?.after !== undefined
+								? { cursor: cursors.endCursors.after }
+								: undefined) ?? options.limit ?? defaultPageSize
 					},
 					new CancellationTokenSource(), { cacheResults: true, resetCache: true }
 				)!;

src/vs/workbench/contrib/timeline/common/timeline.ts

@@ -40,7 +40,7 @@ export interface TimelineChangeEvent {
 export interface TimelineOptions {
 	cursor?: string;
 	before?: boolean;
-	limit?: number | string;
+	limit?: number | { cursor: string };
 }
 
 export interface InternalTimelineOptions {