Fix majority of terminal line/column cases

Tyriar · Tyriar · commit b411fb2c2cac · 2017-09-12T11:38:35.000-07:00
Part of microsoft#34193
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -41,7 +41,7 @@ const lineAndColumnClause = [
 
 // Changing any regex may effect this value, hence changes this as well if required.
 const winLineAndColumnMatchIndex = 12;
-const unixLineAndColumnMatchIndex = 15;
+const unixLineAndColumnMatchIndex = 23;
 
 // Each line and column clause have 6 groups (ie no. of expressions in round brackets)
 const lineAndColumnClauseGroupCount = 6;
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
@@ -138,16 +138,16 @@ suite('Workbench - TerminalLinkHandler', () => {
 					// { urlFormat: '{0} on line {1}, column {2}', line: '5', column: '3' },
 					// { urlFormat: '{0}:line {1}', line: '5' },
 					// { urlFormat: '{0}:line {1}, column {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}', 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})', 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}', 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' }
 				];
 
 				linkUrls.forEach(linkUrl => {
