Include fatal error context on a single line where possible
This commit is contained in:
parent
65a297b952
commit
a3ef0b984b
3 changed files with 17 additions and 11 deletions
12
lib/codeql.js
generated
12
lib/codeql.js
generated
|
|
@ -751,14 +751,18 @@ function extractFatalErrors(error) {
|
|||
let match;
|
||||
while ((match = fatalErrorRegex.exec(error)) !== null) {
|
||||
if (lastFatalErrorIndex !== undefined) {
|
||||
fatalErrors.push(error.slice(lastFatalErrorIndex, match.index));
|
||||
fatalErrors.push(error.slice(lastFatalErrorIndex, match.index).trim());
|
||||
}
|
||||
lastFatalErrorIndex = match.index;
|
||||
}
|
||||
if (lastFatalErrorIndex !== undefined) {
|
||||
const lastError = error.slice(lastFatalErrorIndex);
|
||||
return (lastError +
|
||||
(fatalErrors.length > 0 ? `\nContext:\n${fatalErrors.join("\n")}` : ""));
|
||||
const lastError = error.slice(lastFatalErrorIndex).trim();
|
||||
if (fatalErrors.length === 0) {
|
||||
// No other errors
|
||||
return lastError;
|
||||
}
|
||||
const separator = fatalErrors.some((e) => e.includes("\n")) ? "\n" : " ";
|
||||
return [lastError, "Context:", ...fatalErrors.reverse()].join(separator);
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue