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: remove popup error for decomp failure and type-cast auto-populator (#191)

Browse source
This commit is contained in:
Tyler Wilding 2023-01-19 01:49:25 -05:00 committed by GitHub
parent 77662db8ed
commit 6d8cce8351
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,20 +36,26 @@ const decompStatusItem = vscode.window.createStatusBarItem(
enum DecompStatus {
Idle,
Running,
Errored,
}
function updateStatus(status: DecompStatus, metadata?: any) {
let subText = "";
switch (status) {
case DecompStatus.Errored:
decompStatusItem.tooltip = "Toggle Auto-Decomp";
decompStatusItem.command = "opengoal.decomp.toggleAutoDecompilation";
decompStatusItem.text = "$(testing-error-icon) Decomp Failed";
break;
case DecompStatus.Idle:
decompStatusItem.tooltip = "Toggle Auto-Decompilation";
decompStatusItem.tooltip = "Toggle Auto-Decomp";
decompStatusItem.command = "opengoal.decomp.toggleAutoDecompilation";
if (fsWatcher === undefined) {
decompStatusItem.text =
"$(extensions-sync-ignored) Auto-Decompilation Disabled";
"$(extensions-sync-ignored) Auto-Decomp Disabled";
} else {
decompStatusItem.text =
"$(extensions-sync-enabled) Auto-Decompilation Enabled";
"$(extensions-sync-enabled) Auto-Decomp Enabled";
}
break;
case DecompStatus.Running:
@ -211,15 +217,13 @@ async function decompFiles(decompConfig: string, fileNames: string[]) {
);
channel.append(stdout.toString());
channel.append(stderr.toString());
updateStatus(DecompStatus.Idle);
} catch (error: any) {
vscode.window.showErrorMessage(
"Decompilation Failed, see OpenGOAL Decompiler logs for details"
);
updateStatus(DecompStatus.Errored);
channel.append(
`DECOMP ERROR:\nSTDOUT:\n${error.stdout}\nSTDERR:\n${error.stderr}`
);
}
updateStatus(DecompStatus.Idle);
}
async function getValidObjectNames(gameName: string) {

8
src/decomp/type-caster.ts
View file

@ -100,17 +100,15 @@ export async function updateTypeCastSuggestions(gameName: GameName) {
{
encoding: "utf8",
cwd: getProjectRoot().fsPath,
timeout: 20000,
timeout: 500,
}
);
if (existsSync(jsonPath)) {
const result = readFileSync(jsonPath, { encoding: "utf-8" });
typeCastSuggestions.set(gameName, JSON.parse(result));
}
} catch (error: any) {
vscode.window.showErrorMessage(
"Couldn't get a list of all types to use for casting suggestions"
);
} catch (error: unknown) {
/* empty */
}
}