Handle wrapped lines

Author: Tyriar

src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts

@@ -97,7 +97,6 @@ export class TerminalLinkDetectorAdapter extends Disposable implements ILinkProv
 			}));
 		}
 
-		console.log('provided links', links);
 		return links;
 	}
 

src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts

@@ -27,8 +27,8 @@ const enum Constants {
 
 const candidateMatchers = [
 	// Ripgrep:
-	//   16:console.log(...)
-	//   16:    console.log(...)
+	//   16:searchresult
+	//   16:    searchresult
 	// Eslint:
 	//   16:5  error ...
 	/\s*(?<link>(?<line>\d+):(?<col>\d+)?)/
@@ -89,7 +89,10 @@ export class TerminalMultiLineLinkDetector implements ITerminalLinkDetector {
 			// Scan up looking for the first line that could be a path
 			let possiblePath: string | undefined;
 			for (let index = startLine - 1; index >= 0; index--) {
-				// TODO: This does not currently skip wrapped lines
+				// Ignore lines that aren't at the beginning of a wrapped line
+				if (this.xterm.buffer.active.getLine(index)!.isWrapped) {
+					continue;
+				}
 				const text = getXtermLineContent(this.xterm.buffer.active, index, index, this.xterm.cols);
 				if (!text.match(/^\s*\d/)) {
 					possiblePath = text;

src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts

@@ -89,6 +89,7 @@ const supportedLinkFormats: LinkFormatInfo[] = [
 	{ urlFormat: '{0}\r\n5:another link\r\n{1}:{2} foo', line: '5', column: '3' },
 	{ urlFormat: '{0}\r\n  {1}:{2} foo', line: '5', column: '3' },
 	{ urlFormat: '{0}\r\n  5:6  error  another one\r\n  {1}:{2}  error', line: '5', column: '3' },
+	{ urlFormat: `{0}\r\n  5:6  error  ${'a'.repeat(80)}\r\n  {1}:{2}  error`, line: '5', column: '3' },
 ];
 
 suite('Workbench - TerminalMultiLineLinkDetector', () => {
@@ -115,7 +116,12 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => {
 		const uri = resource ?? URI.file(link);
 		const lines = link.split('\r\n');
 		const lastLine = lines.at(-1)!;
-		await assertLinks(TerminalBuiltinLinkType.LocalFile, link, [{ uri, range: [[1, lines.length], [lastLine.length, lines.length]] }]);
+		// Count lines, accounting for wrapping
+		let lineCount = 0;
+		for (const line of lines) {
+			lineCount += Math.max(Math.ceil(line.length / 80), 1);
+		}
+		await assertLinks(TerminalBuiltinLinkType.LocalFile, link, [{ uri, range: [[1, lineCount], [lastLine.length, lineCount]] }]);
 	}
 
 	setup(() => {