Archive/opengoal-vscode
1
0
Fork 0
mirror of https://github.com/open-goal/opengoal-vscode.git synced 2024-10-19 20:47:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

decomp: disable terminal coloring since VSCode doesn't support ANSI sequences (#341)

Browse source
This commit is contained in:
Tyler Wilding 2024-02-19 20:54:43 -05:00 committed by GitHub
parent 5cadc76b1f
commit 24a78d349a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/decomp/decomp-tools.ts
View file

@ -41,6 +41,7 @@ enum DecompStatus {
Running,
Errored,
Formatting,
FormattingError,
}
function updateStatus(status: DecompStatus, metadata?: any) {
@ -51,6 +52,11 @@ function updateStatus(status: DecompStatus, metadata?: any) {
decompStatusItem.command = "opengoal.decomp.toggleAutoDecompilation";
decompStatusItem.text = "$(testing-error-icon) Decomp Failed";
break;
case DecompStatus.FormattingError:
decompStatusItem.tooltip = "Toggle Auto-Decomp";
decompStatusItem.command = "opengoal.decomp.toggleAutoDecompilation";
decompStatusItem.text = "$(testing-error-icon) Formatting Failed";
break;
case DecompStatus.Idle:
decompStatusItem.tooltip = "Toggle Auto-Decomp";
decompStatusItem.command = "opengoal.decomp.toggleAutoDecompilation";
@ -250,6 +256,7 @@ async function decompFiles(
decompConfig,
"./iso_data",
"./decompiler_out",
"--disable-ansi",
"--version",
getDecompilerConfigVersion(gameName),
"--config-override",
@ -298,7 +305,7 @@ async function decompFiles(
`${name}_disasm.gc`,
);
const formatterArgs = ["--write", "--file", filePath];
const formatterArgs = ["--write", "--disable-ansi", "--file", filePath];
try {
const { stdout, stderr } = await execFileAsync(
formatterPath,
@ -312,9 +319,9 @@ async function decompFiles(
channel.append(stdout.toString());
channel.append(stderr.toString());
} catch (error: any) {
updateStatus(DecompStatus.Errored);
updateStatus(DecompStatus.FormattingError);
channel.append(
`DECOMP ERROR:\nSTDOUT:\n${error.stdout}\nSTDERR:\n${error.stderr}`,
`FORMATTER ERROR:\nSTDOUT:\n${error.stdout}\nSTDERR:\n${error.stderr}`,
);
}
}