Merge pull request microsoft#181756 from microsoft/tyriar/180574

Ignore query string in detected terminal local links

Author: Tyriar

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

@@ -105,7 +105,7 @@ function generateLinkSuffixRegex(eolOnly: boolean) {
 
 /**
  * Removes the optional link suffix which contains line and column information.
- * @param link The link to parse.
+ * @param link The link to use.
  */
 export function removeLinkSuffix(link: string): string {
 	const suffix = getLinkSuffix(link)?.suffix;
@@ -115,6 +115,20 @@ export function removeLinkSuffix(link: string): string {
 	return link.substring(0, suffix.index);
 }
 
+/**
+ * Removes any query string from the link.
+ * @param link The link to use.
+ */
+export function removeLinkQueryString(link: string): string {
+	// Skip ? in UNC paths
+	const start = link.startsWith('\\\\?\\') ? 4 : 0;
+	const index = link.indexOf('?', start);
+	if (index === -1) {
+		return link;
+	}
+	return link.substring(0, index);
+}
+
 /**
  * Returns the optional link suffix which contains line and column information.
  * @param link The link to parse.

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITerminalLinkResolver, ResolvedLink } from 'vs/workbench/contrib/terminalContrib/links/browser/links';
-import { removeLinkSuffix, winDrivePrefix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
+import { removeLinkSuffix, removeLinkQueryString, winDrivePrefix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
 import { URI } from 'vs/base/common/uri';
 import { ITerminalBackend, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
 import { Schemas } from 'vs/base/common/network';
@@ -52,9 +52,14 @@ export class TerminalLinkResolver implements ITerminalLinkResolver {
 			}
 		}
 
-		// Remove any line/col suffix before processing the path
+		// Remove any line/col suffix
 		let linkUrl = removeLinkSuffix(link);
-		if (!linkUrl) {
+
+		// Remove any query string
+		linkUrl = removeLinkQueryString(linkUrl);
+
+		// Exit early if the link is determines as not valid already
+		if (linkUrl.length === 0) {
 			cache.set(link, null);
 			return null;
 		}

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

@@ -5,7 +5,7 @@
 
 import { deepStrictEqual, ok, strictEqual } from 'assert';
 import { OperatingSystem } from 'vs/base/common/platform';
-import { detectLinks, detectLinkSuffixes, getLinkSuffix, IParsedLink, removeLinkSuffix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
+import { detectLinks, detectLinkSuffixes, getLinkSuffix, IParsedLink, removeLinkQueryString, removeLinkSuffix } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing';
 
 interface ITestLink {
 	link: string;
@@ -206,6 +206,19 @@ suite('TerminalLinkParsing', () => {
 			);
 		});
 	});
+	suite('removeLinkQueryString', () => {
+		test('should remove any query string from the link', () => {
+			strictEqual(removeLinkQueryString('?a=b'), '');
+			strictEqual(removeLinkQueryString('foo?a=b'), 'foo');
+			strictEqual(removeLinkQueryString('./foo?a=b'), './foo');
+			strictEqual(removeLinkQueryString('/foo/bar?a=b'), '/foo/bar');
+			strictEqual(removeLinkQueryString('foo?a=b?'), 'foo');
+			strictEqual(removeLinkQueryString('foo?a=b&c=d'), 'foo');
+		});
+		test('should respect ? in UNC paths', () => {
+			strictEqual(removeLinkQueryString('\\\\?\\foo?a=b'), '\\\\?\\foo',);
+		});
+	});
 	suite('detectLinks', () => {
 		test('foo(1, 2) bar[3, 4] "baz" on line 5', () => {
 			deepStrictEqual(