Consider all links when common directories are removed

Tyriar · Tyriar · commit 4fb84260beaf · 2022-12-02T11:04:07.000-08:00
Fixes microsoft#164687
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkHelpers.ts
@@ -156,27 +156,32 @@ export function positionIsInRange(position: IBufferCellPosition, range: IBufferR
  * For shells with the CommandDetection capability, the cwd for a command relative to the line of
  * the particular link can be used to narrow down the result for an exact file match.
  */
-export function updateLinkWithRelativeCwd(capabilities: ITerminalCapabilityStore, y: number, text: string, pathSeparator: string): string | undefined {
+export function updateLinkWithRelativeCwd(capabilities: ITerminalCapabilityStore, y: number, text: string, pathSeparator: string): string[] | undefined {
 	const cwd = capabilities.get(TerminalCapability.CommandDetection)?.getCwdForLine(y);
 	if (!cwd) {
 		return undefined;
 	}
+	const result: string[] = [];
 	if (!text.includes(pathSeparator)) {
-		text = cwd + pathSeparator + text;
+		result.push(cwd + pathSeparator + text);
 	} else {
 		let commonDirs = 0;
 		let i = 0;
 		const cwdPath = cwd.split(pathSeparator).reverse();
 		const linkPath = text.split(pathSeparator);
+		// Get all results as candidates, prioritizing the link with the most common directories.
+		// For example if in the directory /home/common and the link is common/file, the result
+		// should be: `['/home/common/common/file', '/home/common/file']`. The first is the most
+		// likely as cwd detection is active.
 		while (i < cwdPath.length) {
+			result.push(cwd + pathSeparator + linkPath.slice(commonDirs).join(pathSeparator));
 			if (cwdPath[i] === linkPath[i]) {
 				commonDirs++;
 			}
 			i++;
 		}
-		text = cwd + pathSeparator + linkPath.slice(commonDirs).join(pathSeparator);
 	}
-	return text;
+	return result;
 }
 
 export function osPathModule(os: OperatingSystem): IPath {
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts
@@ -173,7 +173,7 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
 		});
 		let cwdResolvedText = text;
 		if (this._capabilities.has(TerminalCapability.CommandDetection)) {
-			cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, pathSeparator) || text;
+			cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, pathSeparator)?.[0] || text;
 		}
 
 		// Try open the cwd resolved link first
diff --git a/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts b/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts
@@ -157,7 +157,7 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 					// not exist. Doing otherwise could cause unexpected results where handling via the
 					// word link detector is preferable.
 					if (absolutePath) {
-						linkCandidates.push(absolutePath);
+						linkCandidates.push(...absolutePath);
 					}
 				} else {
 					// Fallback to resolving against the initial cwd, removing any relative directory prefixes

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {`
`173`	`173`	`});`
`174`	`174`	`let cwdResolvedText = text;`
`175`	`175`	`if (this._capabilities.has(TerminalCapability.CommandDetection)) {`
`176`		`- cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, pathSeparator) \|\| text;`
	`176`	`+ cwdResolvedText = updateLinkWithRelativeCwd(this._capabilities, link.bufferRange.start.y, text, pathSeparator)?.[0] \|\| text;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`// Try open the cwd resolved link first`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {`
`157`	`157`	`// not exist. Doing otherwise could cause unexpected results where handling via the`
`158`	`158`	`// word link detector is preferable.`
`159`	`159`	`if (absolutePath) {`
`160`		`- linkCandidates.push(absolutePath);`
	`160`	`+ linkCandidates.push(...absolutePath);`
`161`	`161`	`}`
`162`	`162`	`} else {`
`163`	`163`	`// Fallback to resolving against the initial cwd, removing any relative directory prefixes`