show more link results (microsoft#153263)

Author: meganrogge

src/vs/workbench/contrib/terminal/browser/links/terminalLinkManager.ts

@@ -57,6 +57,8 @@ export class TerminalLinkManager extends DisposableStore {
 	// both local and remote terminals are present
 	private readonly _resolvedLinkCache = new LinkCache();
 
+	private _lastTopLine: number | undefined;
+
 	constructor(
 		private readonly _xterm: Terminal,
 		private readonly _processManager: ITerminalProcessManager,
@@ -141,12 +143,20 @@ export class TerminalLinkManager extends DisposableStore {
 		return links[0];
 	}
 
-	async getLinks(): Promise<IDetectedLinks> {
+	async getLinks(extended?: boolean): Promise<IDetectedLinks> {
 		const wordResults: ILink[] = [];
 		const webResults: ILink[] = [];
 		const fileResults: ILink[] = [];
-
-		for (let i = this._xterm.buffer.active.length - 1; i >= this._xterm.buffer.active.viewportY; i--) {
+		let noMoreResults: boolean = false;
+		let topLine = !extended ? this._xterm.buffer.active.viewportY - Math.min(this._xterm.rows, 50) : this._lastTopLine! - 1000;
+		if (topLine < 0 || topLine - Math.min(this._xterm.rows, 50) < 0) {
+			noMoreResults = true;
+		}
+		if (topLine < 0) {
+			topLine = 0;
+		}
+		this._lastTopLine = topLine;
+		for (let i = this._xterm.buffer.active.length - 1; i >= topLine; i--) {
 			const links = await this._getLinksForLine(i);
 			if (links) {
 				const { wordLinks, webLinks, fileLinks } = links;
@@ -161,7 +171,7 @@ export class TerminalLinkManager extends DisposableStore {
 				}
 			}
 		}
-		return { webLinks: webResults, fileLinks: fileResults, wordLinks: wordResults };
+		return { webLinks: webResults, fileLinks: fileResults, wordLinks: wordResults, noMoreResults };
 	}
 
 	private async _getLinksForLine(y: number): Promise<IDetectedLinks | undefined> {
@@ -469,6 +479,7 @@ export interface IDetectedLinks {
 	wordLinks?: ILink[];
 	webLinks?: ILink[];
 	fileLinks?: ILink[];
+	noMoreResults?: boolean;
 }
 
 const enum LinkCacheConstants {

src/vs/workbench/contrib/terminal/browser/links/terminalLinkQuickpick.ts

@@ -4,13 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EventType } from 'vs/base/browser/dom';
+import { Emitter } from 'vs/base/common/event';
 import { localize } from 'vs/nls';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { IDetectedLinks } from 'vs/workbench/contrib/terminal/browser/links/terminalLinkManager';
 import { TerminalLinkQuickPickEvent } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { ILink } from 'xterm';
 
 export class TerminalLinkQuickpick {
+
+	private readonly _onDidRequestMoreLinks = new Emitter<void>();
+	readonly onDidRequestMoreLinks = this._onDidRequestMoreLinks.event;
 	constructor(
 		@IQuickInputService private readonly _quickInputService: IQuickInputService
 	) { }
@@ -21,7 +25,8 @@ export class TerminalLinkQuickpick {
 		const webPicks = links.webLinks ? await this._generatePicks(links.webLinks) : undefined;
 		const options = {
 			placeHolder: localize('terminal.integrated.openDetectedLink', "Select the link to open"),
-			canPickMany: false
+			canPickMany: false,
+
 		};
 		const picks: LinkQuickPickItem[] = [];
 		if (webPicks) {
@@ -36,13 +41,21 @@ export class TerminalLinkQuickpick {
 			picks.push({ type: 'separator', label: localize('terminal.integrated.searchLinks', "Workspace Search") });
 			picks.push(...wordPicks);
 		}
-
+		picks.push({ type: 'separator' });
+		if (!links.noMoreResults) {
+			const showMoreItem = { label: localize('terminal.integrated.showMoreLinks', "Show more links") };
+			picks.push(showMoreItem);
+		}
 		const pick = await this._quickInputService.pick(picks, options);
 		if (!pick) {
 			return;
 		}
 		const event = new TerminalLinkQuickPickEvent(EventType.CLICK);
-		pick.link.activate(event, pick.label);
+		if ('link' in pick) {
+			pick.link.activate(event, pick.label);
+		} else {
+			this._onDidRequestMoreLinks.fire();
+		}
 		return;
 	}
 
@@ -67,4 +80,4 @@ export interface ITerminalLinkQuickPickItem extends IQuickPickItem {
 	link: ILink;
 }
 
-type LinkQuickPickItem = ITerminalLinkQuickPickItem | IQuickPickSeparator;
+type LinkQuickPickItem = ITerminalLinkQuickPickItem | IQuickPickSeparator | IQuickPickItem;

src/vs/workbench/contrib/terminal/browser/terminalInstance.ts

@@ -778,25 +778,28 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 	}
 
-	async showLinkQuickpick(): Promise<void> {
+	async showLinkQuickpick(extended?: boolean): Promise<void> {
 		if (!this._terminalLinkQuickpick) {
 			this._terminalLinkQuickpick = this._instantiationService.createInstance(TerminalLinkQuickpick);
+			this._terminalLinkQuickpick.onDidRequestMoreLinks(() => {
+				this.showLinkQuickpick(true);
+			});
 		}
-		const links = await this._getLinks();
+		const links = await this._getLinks(extended);
 		if (!links) {
 			return;
 		}
 		return await this._terminalLinkQuickpick.show(links);
 	}
 
-	private async _getLinks(): Promise<IDetectedLinks | undefined> {
+	private async _getLinks(extended?: boolean): Promise<IDetectedLinks | undefined> {
 		if (!this.areLinksReady || !this._linkManager) {
 			throw new Error('terminal links are not ready, cannot generate link quick pick');
 		}
 		if (!this.xterm) {
 			throw new Error('no xterm');
 		}
-		return this._linkManager.getLinks();
+		return this._linkManager.getLinks(extended);
 	}
 
 	async openRecentLink(type: 'localFile' | 'url'): Promise<void> {