be more strict about what we match to linkify a stack frame

amunger · amunger · commit 0898fe3d2f29 · 2023-11-06T13:35:01.000-08:00
diff --git a/extensions/notebook-renderers/src/stackTraceHelper.ts b/extensions/notebook-renderers/src/stackTraceHelper.ts
@@ -31,7 +31,7 @@ export function formatStackTrace(stack: string) {
 
 const formatSequence = /\u001b\[.+?m/g;
 const fileRegex = /File\s+(?:\u001b\[.+?m)?(.+):(\d+)/;
-const lineNumberRegex = /((?:\u001b\[.+?m)?[ ->]*?)(\d+)(.*)/;
+const lineNumberRegex = /^((?:\u001b\[.+?m)?[ \->]+?)(\d+)(?:\u001b\[0m)?( .*)/;
 const cellRegex = /(?<prefix>Cell\s+(?:\u001b\[.+?m)?In\s*\[(?<executionCount>\d+)\],\s*)(?<lineLabel>line (?<lineNumber>\d+)).*/;
 // older versions of IPython ~8.3.0
 const inputRegex = /(?<prefix>Input\s+?(?:\u001b\[.+?m)(?<cellLabel>In\s*\[(?<executionCount>\d+)\]))(?<postfix>.*)/;
@@ -41,7 +41,7 @@ function isIpythonStackTrace(stack: string) {
 }
 
 function stripFormatting(text: string) {
-	return text.replace(formatSequence, '');
+	return text.replace(formatSequence, '').trim();
 }
 
 type cellLocation = { kind: 'cell'; path: string };

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export function formatStackTrace(stack: string) {`
`31`	`31`
`32`	`32`	`const formatSequence = /\u001b\[.+?m/g;`
`33`	`33`	`const fileRegex = /File\s+(?:\u001b\[.+?m)?(.+):(\d+)/;`
`34`		`-const lineNumberRegex = /((?:\u001b\[.+?m)?[ ->]?)(\d+)(.)/;`
	`34`	`+const lineNumberRegex = /^((?:\u001b\[.+?m)?[ \->]+?)(\d+)(?:\u001b\[0m)?( .*)/;`
`35`	`35`	`const cellRegex = /(?<prefix>Cell\s+(?:\u001b\[.+?m)?In\s\[(?<executionCount>\d+)\],\s)(?<lineLabel>line (?<lineNumber>\d+)).*/;`
`36`	`36`	`// older versions of IPython ~8.3.0`
`37`	`37`	`const inputRegex = /(?<prefix>Input\s+?(?:\u001b\[.+?m)(?<cellLabel>In\s\[(?<executionCount>\d+)\]))(?<postfix>.)/;`
`@@ -41,7 +41,7 @@ function isIpythonStackTrace(stack: string) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`function stripFormatting(text: string) {`
`44`		`- return text.replace(formatSequence, '');`
	`44`	`+ return text.replace(formatSequence, '').trim();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`type cellLocation = { kind: 'cell'; path: string };`