actions/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action synced 2026-05-31 00:00:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include fatal error context on a single line where possible

Browse Source
This commit is contained in:
Henry Mercer
2023-07-21 14:24:59 +01:00
parent 65a297b952
commit a3ef0b984b
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/codeql.js
Generated
+8 -4
View File
@@ -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;
}
lib/codeql.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
src/codeql.ts
+8 -6
View File
@@ -1170,16 +1170,18 @@ function extractFatalErrors(error: string): string | undefined {
let match: RegExpMatchArray | null;
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;
}