Merge pull request #43733 from DominikDitoIvosevic/bugs/13245/doivosev/linkSpaceCaptureFix

Added support for links of file paths with spaces (#13245)

src/vs/workbench/parts/output/common/outputLinkComputer.ts

@@ -94,23 +94,28 @@ export class OutputLinkComputer {
 		]);
 
 		workspaceFolderVariants.forEach(workspaceFolderVariant => {
+			const validPathCharacterPattern = '[^\\s\\(\\):<>"]';
+			const validPathCharacterOrSpacePattern = `(?:${validPathCharacterPattern}| ${validPathCharacterPattern})`;
+			const pathPattern = `${validPathCharacterOrSpacePattern}+\\.${validPathCharacterPattern}+`;
+			const strictPathPattern = `${validPathCharacterPattern}+`;
 
 			// Example: /workspaces/express/server.js on line 8, column 13
-			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + '(\\S*) on line ((\\d+)(, column (\\d+))?)', 'gi'));
+			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + `(${pathPattern}) on line ((\\d+)(, column (\\d+))?)`, 'gi'));
 
 			// Example: /workspaces/express/server.js:line 8, column 13
-			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + '(\\S*):line ((\\d+)(, column (\\d+))?)', 'gi'));
+			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + `(${pathPattern}):line ((\\d+)(, column (\\d+))?)`, 'gi'));
 
 			// Example: /workspaces/mankala/Features.ts(45): error
 			// Example: /workspaces/mankala/Features.ts (45): error
 			// Example: /workspaces/mankala/Features.ts(45,18): error
 			// Example: /workspaces/mankala/Features.ts (45,18): error
-			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + '([^\\s\\(\\)]*)(\\s?\\((\\d+)(,(\\d+))?)\\)', 'gi'));
+			// Example: /workspaces/mankala/Features Special.ts (45,18): error
+			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + `(${pathPattern})(\\s?\\((\\d+)(,(\\d+))?)\\)`, 'gi'));
 
 			// Example: at /workspaces/mankala/Game.ts
 			// Example: at /workspaces/mankala/Game.ts:336
 			// Example: at /workspaces/mankala/Game.ts:336:9
-			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + '([^:\\s\\(\\)<>\'\"\\[\\]]*)(:(\\d+))?(:(\\d+))?', 'gi'));
+			patterns.push(new RegExp(strings.escapeRegExpCharacters(workspaceFolderVariant) + `(${strictPathPattern})(:(\\d+))?(:(\\d+))?`, 'gi'));
 		});
 
 		return patterns;

src/vs/workbench/parts/output/test/outputLinkProvider.test.ts

@@ -115,7 +115,7 @@ suite('Workbench - OutputWorker', () => {
 		line = toOSPath(' at C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\Game.ts] in');
 		result = OutputLinkComputer.detectLinks(line, 1, patternsSlash, contextService);
 		assert.equal(result.length, 1);
-		assert.equal(result[0].url, contextService.toResource('/Game.ts').toString());
+		assert.equal(result[0].url, contextService.toResource('/Game.ts]').toString());
 
 		// Example: C:\Users\someone\AppData\Local\Temp\_monacodata_9888\workspaces\express\server.js on line 8
 		line = toOSPath('C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\Game.ts on line 8');
@@ -385,6 +385,20 @@ suite('Workbench - OutputWorker', () => {
 		assert.equal(result[0].range.startColumn, 1);
 		assert.equal(result[0].range.endColumn, 106);
 
+		// Example: C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\lib\\something\\Features Special.ts (45,18): error.
+		line = toOSPath('C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\lib\\something\\Features Special.ts (45,18): error');
+		result = OutputLinkComputer.detectLinks(line, 1, patternsSlash, contextService);
+		assert.equal(result.length, 1);
+		assert.equal(result[0].url, contextService.toResource('/lib/something/Features Special.ts').toString() + '#45,18');
+		assert.equal(result[0].range.startColumn, 1);
+		assert.equal(result[0].range.endColumn, 114);
+
+		result = OutputLinkComputer.detectLinks(line, 1, patternsBackSlash, contextService);
+		assert.equal(result.length, 1);
+		assert.equal(result[0].url, contextService.toResource('/lib/something/Features Special.ts').toString() + '#45,18');
+		assert.equal(result[0].range.startColumn, 1);
+		assert.equal(result[0].range.endColumn, 114);
+
 		// Example: at C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\Game.ts.
 		line = toOSPath(' at C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\Game.ts. in');
 		result = OutputLinkComputer.detectLinks(line, 1, patternsSlash, contextService);
@@ -415,8 +429,8 @@ suite('Workbench - OutputWorker', () => {
 		line = toOSPath(' at \'C:\\Users\\someone\\AppData\\Local\\Temp\\_monacodata_9888\\workspaces\\mankala\\Game.ts\' in');
 		result = OutputLinkComputer.detectLinks(line, 1, patternsSlash, contextService);
 		assert.equal(result.length, 1);
-		assert.equal(result[0].url, contextService.toResource('/Game.ts').toString());
+		assert.equal(result[0].url, contextService.toResource('/Game.ts\'').toString());
 		assert.equal(result[0].range.startColumn, 6);
-		assert.equal(result[0].range.endColumn, 85);
+		assert.equal(result[0].range.endColumn, 86);
 	});
 });
\ No newline at end of file