Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle new URI format from webview

Browse Source
This commit is contained in:
aamunger
2023-10-17 11:10:03 -07:00
committed by Aaron Munger
parent 3b6848c4e6
commit a9ee16c135
3 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/notebook-renderers/src/stackTraceHelper.ts
View File

@@ -44,10 +44,15 @@ function stripFormatting(text: string) {
return text.replace(formatSequence, '');
}
type cellLocation = { kind: 'cell'; path: string };
type fileLocation = { kind: 'file'; path: string };
type location = cellLocation | fileLocation;
function linkifyStack(stack: string) {
const lines = stack.split('\n');
let fileOrCell: string | undefined;
let fileOrCell: location | undefined;
for (const i in lines) {
@@ -55,20 +60,20 @@ function linkifyStack(stack: string) {
console.log(`linkify ${original}`); // REMOVE
if (fileRegex.test(original)) {
const fileMatch = lines[i].match(fileRegex);
fileOrCell = stripFormatting(fileMatch![1]);
fileOrCell = { kind: 'file', path: stripFormatting(fileMatch![1]) };
console.log(`matched file ${fileOrCell}`); // REMOVE
continue;
} else if (cellRegex.test(original)) {
lines[i] = original.replace(cellRegex, (_s, cellLabel, executionCount, suffix) => {
fileOrCell = `vscode-notebook-cell:?execution=${stripFormatting(executionCount)}`;
return `<a href='${fileOrCell}'>${stripFormatting(cellLabel)}</a>${suffix}`;
fileOrCell = { kind: 'cell', path: `vscode-notebook-cell:?execution=${stripFormatting(executionCount)}` };
return `<a href='${fileOrCell.path}'>${stripFormatting(cellLabel)}</a>${suffix}`;
});
console.log(`matched cell ${fileOrCell}`); // REMOVE
continue;
} else if (inputRegex.test(original)) {
lines[i] = original.replace(inputRegex, (_s, cellLabel, executionCount, suffix) => {
fileOrCell = `vscode-notebook-cell:?execution=${stripFormatting(executionCount)}`;
return `<a href='${fileOrCell}'>${stripFormatting(cellLabel)}</a>${suffix}`;
fileOrCell = { kind: 'cell', path: `vscode-notebook-cell:?execution=${stripFormatting(executionCount)}` };
return `<a href='${fileOrCell.path}'>${stripFormatting(cellLabel)}</a>${suffix}`;
});
console.log(`matched cell ${fileOrCell}`); // REMOVE
continue;
@@ -77,9 +82,10 @@ function linkifyStack(stack: string) {
fileOrCell = undefined;
continue;
} else if (lineNumberRegex.test(original)) {
lines[i] = original.replace(lineNumberRegex, (_s, prefix, num, suffix) => {
return `${prefix}<a href='${fileOrCell}:${num}'>${num}</a>${suffix}`;
return fileOrCell?.kind === 'file' ?
`${prefix}<a href='${fileOrCell?.path}:${num}'>${num}</a>${suffix}` :
`${prefix}<a href='${fileOrCell?.path}&line=${num}'>${num}</a>${suffix}`;
});
console.log(`matched line ${lines[i]}`); // REMOVE
continue;

4
extensions/notebook-renderers/src/test/stackTraceHelper.test.ts
View File

@@ -33,7 +33,7 @@ suite('StackTraceHelper', () => {
const formatted = formatStackTrace(stack);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=3\'>Cell In[3]</a>') > 0, formatted);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=3:2\'>2</a>') > 0, formatted);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=3&line=2\'>2</a>') > 0, formatted);
assert.ok(formatted.indexOf('<a href=\'C:\\venvs\\myLib.py:2\'>2</a>') > 0, formatted);
});
@@ -47,7 +47,7 @@ suite('StackTraceHelper', () => {
const formatted = formatStackTrace(stack);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=2\'>Input In [2]</a>') > 0, formatted);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=2:2\'>2</a>') > 0, formatted);
assert.ok(formatted.indexOf('<a href=\'vscode-notebook-cell:?execution=2&line=2\'>2</a>') > 0, formatted);
});
test('IPython stack trace lines without associated location are not linkified', () => {