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

type-searcher: improve type searcher UI and fix some bugs (#170)

Browse source
This commit is contained in:
Tyler Wilding 2022-12-11 18:50:59 -05:00 committed by GitHub
parent fc89721de2
commit 7834b8be9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 72 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/decomp/type-searcher/type-searcher.ts
View file

@ -60,7 +60,7 @@ function getWebviewContent() {
function search(evt) { function search(evt) {
let parentName = document.getElementById("parent-name").value; let parentName = document.getElementById("parent-name").value;
let typeSize = parseInt(document.getElementById("type-size").value); let typeSize = document.getElementById("type-size").value;
let methodId = parseInt(document.getElementById("method-id").value); let methodId = parseInt(document.getElementById("method-id").value);
let gameName = document.getElementById("game-name").value; let gameName = document.getElementById("game-name").value;
@ -94,12 +94,14 @@ function getWebviewContent() {
const nameColumn = document.createElement("div"); const nameColumn = document.createElement("div");
nameColumn.className = "column column-25"; nameColumn.className = "column column-25";
const nameField = document.createElement("sl-input"); const nameField = document.createElement("sl-input");
nameField.className = "field-name";
nameField.label = "Field Type Name?"; nameField.label = "Field Type Name?";
nameColumn.appendChild(nameField); nameColumn.appendChild(nameField);
const offsetColumn = document.createElement("div"); const offsetColumn = document.createElement("div");
offsetColumn.className = "column column-25"; offsetColumn.className = "column column-25";
const offsetField = document.createElement("sl-input"); const offsetField = document.createElement("sl-input");
offsetField.className = "field-offset";
offsetField.label = "Offset?"; offsetField.label = "Offset?";
offsetField.type = "number"; offsetField.type = "number";
offsetColumn.appendChild(offsetField); offsetColumn.appendChild(offsetField);
@ -121,18 +123,25 @@ function getWebviewContent() {
window.addEventListener('message', event => { window.addEventListener('message', event => {
document.getElementById("results").innerHTML = ""; document.getElementById("results").innerHTML = "";
const message = event.data; const message = event.data;
document.getElementById("command").innerHTML = JSON.stringify(message.args);
if (message.command === "search") { if (message.command === "search") {
if (message.data instanceof Array && message.data.length <= 0) { if (message.data instanceof Array && message.data.length <= 0) {
const column = document.createElement("div"); const column = document.createElement("div");
column.className = "column column-20"; column.className = "column";
const content = document.createTextNode("No Results"); const content = document.createTextNode("No Results");
column.appendChild(content); column.appendChild(content);
document.getElementById("results").appendChild(column); document.getElementById("results").appendChild(column);
} else if (message.data.length === 1) {
const column = document.createElement("div");
column.className = "column";
const content = document.createTextNode(message.data[0]);
column.appendChild(content);
document.getElementById("results").appendChild(column);
} else { } else {
for (const name of message.data) { for (const val of message.data) {
const column = document.createElement("div"); const column = document.createElement("div");
column.className = "column column-20"; column.className = "column column-20";
const content = document.createTextNode(name); const content = document.createTextNode(val);
column.appendChild(content); column.appendChild(content);
document.getElementById("results").appendChild(column); document.getElementById("results").appendChild(column);
} }
@ -141,24 +150,26 @@ function getWebviewContent() {
}); });
</script> </script>
<div class="container"> <div class="container">
<div class="row">
<div class="column column-50">
<h2 class="mt-2">General Filters</h2> <h2 class="mt-2">General Filters</h2>
<div class="row"> <div class="row">
<div class="column column-25"> <div class="column">
<sl-input label="Parent Type Name?" id="parent-name"></sl-input> <sl-input label="Parent Type Name?" id="parent-name"></sl-input>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="column column-25"> <div class="column">
<sl-input label="Type Size?" id="type-size" type="number"></sl-input> <sl-input label="Type Size?" id="type-size"></sl-input>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="column column-25"> <div class="column">
<sl-input label="Method ID?" id="method-id" type="number"></sl-input> <sl-input label="Method ID?" id="method-id" type="number"></sl-input>
</div> </div>
</div> </div>
<div class="row mt-1"> <div class="row mt-1">
<div class="column column-25"> <div class="column">
<sl-radio-group label="Game?" value="jak2" fieldset id="game-name"> <sl-radio-group label="Game?" value="jak2" fieldset id="game-name">
<sl-radio-button value="jak1">Jak 1</sl-radio-button> <sl-radio-button value="jak1">Jak 1</sl-radio-button>
<sl-radio-button value="jak2">Jak 2</sl-radio-button> <sl-radio-button value="jak2">Jak 2</sl-radio-button>
@ -167,13 +178,15 @@ function getWebviewContent() {
</sl-radio-group> </sl-radio-group>
</div> </div>
</div> </div>
</div>
<div class="column column-50">
<h2 class="mt-2">Field Type Filters</h2> <h2 class="mt-2">Field Type Filters</h2>
<div id="field-filters"> <div id="field-filters">
<div class="row wrap"> <div class="row wrap">
<div class="column column-25"> <div class="column column-50">
<sl-input label="Field Type Name?" class="field-name"></sl-input> <sl-input label="Field Type Name?" class="field-name"></sl-input>
</div> </div>
<div class="column column-25"> <div class="column column-50">
<sl-input label="Offset?" class="field-offset" type="number"></sl-input> <sl-input label="Offset?" class="field-offset" type="number"></sl-input>
</div> </div>
</div> </div>
@ -181,10 +194,19 @@ function getWebviewContent() {
<div class="row mt-2"> <div class="row mt-2">
<div class="column"> <div class="column">
<sl-button variant="primary" onclick="addField()" class="mr-1">Add Another Field</sl-button> <sl-button variant="primary" onclick="addField()" class="mr-1">Add Another Field</sl-button>
</div>
</div>
</div>
</div>
<div class="row mt-2">
<div class="column">
<sl-button variant="success" onclick="search()" class="mr-1">Search</sl-button> <sl-button variant="success" onclick="search()" class="mr-1">Search</sl-button>
<sl-button variant="warning" onclick="clearFields()">Clear</sl-button> <sl-button variant="warning" onclick="clearFields()">Clear</sl-button>
</div> </div>
</div> </div>
<div class="row mt-2">
<div class="column" id="command"></div>
</div>
<h2 class="mt-2">Results</h2> <h2 class="mt-2">Results</h2>
<div class="row wrap" id="results"> <div class="row wrap" id="results">
<div class="column column-20">No Results</div> <div class="column column-20">No Results</div>
@ -210,7 +232,7 @@ const execFileAsync = util.promisify(execFile);
let projectRoot: vscode.Uri | undefined = undefined; let projectRoot: vscode.Uri | undefined = undefined;
let currentPanel: vscode.WebviewPanel | undefined = undefined; let currentPanel: vscode.WebviewPanel | undefined = undefined;
async function searchForTypes(message: any): Promise<string[]> { async function searchForTypes(message: any): Promise<any> {
if (projectRoot === undefined) { if (projectRoot === undefined) {
projectRoot = getWorkspaceFolderByName("jak-project"); projectRoot = getWorkspaceFolderByName("jak-project");
if (projectRoot === undefined) { if (projectRoot === undefined) {
@ -241,7 +263,7 @@ async function searchForTypes(message: any): Promise<string[]> {
args.push(`--parent`); args.push(`--parent`);
args.push(message.parentName); args.push(message.parentName);
} }
if ("typeSize" in message && message.typeSize !== null) { if ("typeSize" in message && message.typeSize !== "") {
args.push(`--size`); args.push(`--size`);
args.push(message.typeSize); args.push(message.typeSize);
} }
@ -280,10 +302,17 @@ async function searchForTypes(message: any): Promise<string[]> {
); );
// Parse the file // Parse the file
const result = readFileSync(searchFile, { encoding: "utf-8" }); const result = readFileSync(searchFile, { encoding: "utf-8" });
return JSON.parse(result); return {
results: JSON.parse(result),
args: args,
};
} catch (error: any) { } catch (error: any) {
console.log(error); console.log(error);
return [`error - ${error}`]; return {
error: true,
results: [`error - ${error}`],
args: args,
};
} }
} }
@ -307,7 +336,8 @@ async function openPanel() {
const result = await searchForTypes(message); const result = await searchForTypes(message);
currentPanel?.webview.postMessage({ currentPanel?.webview.postMessage({
command: "search", command: "search",
data: result, data: result.results,
args: result.args,
}); });
} }
}, },