Support space after comma in links like '[x, y]'

Tyriar · Tyriar · commit 9ac6c540bfc3 · 2017-06-28T14:12:04.000-07:00
Fixes microsoft#26330
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -35,7 +35,7 @@ replacing space with nonBreakningSpace or space ASCII code - 32. */
 const lineAndColumnClause = [
 	'((\\S*) on line ((\\d+)(, column (\\d+))?))', // (file path) on line 8, column 13
 	'((\\S*):line ((\\d+)(, column (\\d+))?))', // (file path):line 8, column 13
-	'(([^\\s\\(\\)]*)(\\s?[\\(\\[](\\d+)(,(\\d+))?)[\\)\\]])', // (file path)(45), (file path) (45), (file path)(45,18), (file path) (45,18)
+	'(([^\\s\\(\\)]*)(\\s?[\\(\\[](\\d+)(,\\s?(\\d+))?)[\\)\\]])', // (file path)(45), (file path) (45), (file path)(45,18), (file path) (45,18), (file path)(45, 18), (file path) (45, 18), also with []
 	'(([^:\\s\\(\\)<>\'\"\\[\\]]*)(:(\\d+))?(:(\\d+))?)' // (file path):336, (file path):336:9
 ].join('|').replace(/ /g, `[${'\u00A0'} ]`);
 
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
@@ -96,12 +96,16 @@ suite('Workbench - TerminalLinkHandler', () => {
 					{ urlFormat: '{0} ({1})', line: '5' },
 					{ urlFormat: '{0}({1},{2})', line: '5', column: '3' },
 					{ urlFormat: '{0} ({1},{2})', line: '5', column: '3' },
+					{ urlFormat: '{0}({1}, {2})', line: '5', column: '3' },
+					{ urlFormat: '{0} ({1}, {2})', line: '5', column: '3' },
 					{ urlFormat: '{0}:{1}', line: '5' },
 					{ urlFormat: '{0}:{1}:{2}', line: '5', column: '3' },
 					{ urlFormat: '{0}[{1}]', line: '5' },
 					{ urlFormat: '{0} [{1}]', line: '5' },
 					{ urlFormat: '{0}[{1},{2}]', line: '5', column: '3' },
-					{ urlFormat: '{0} [{1},{2}]', line: '5', column: '3' }
+					{ urlFormat: '{0} [{1},{2}]', line: '5', column: '3' },
+					{ urlFormat: '{0}[{1}, {2}]', line: '5', column: '3' },
+					{ urlFormat: '{0} [{1}, {2}]', line: '5', column: '3' }
 				];
 
 				linkUrls.forEach(linkUrl => {
