Skip to content

Commit

Permalink
script_editor.as: Fixes during review
Browse files Browse the repository at this point in the history 
* changed "select+load" to just "load" in menubar.
* workaround: clamp error line num.s to actual line count
* Renamed "Welcome" tab to "Tutorial.as".
* fixed bogus filesize of Recent scripts.
  • Loading branch information
@ohlidalp
ohlidalp committed Sep 26, 2023
1 parent 1302ad7 commit 91f99be
Showing 1 changed file with 53 additions and 42 deletions.
95 changes: 53 additions & 42 deletions resources/scripts/script_editor.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const int BUFFER_MIN_SIZE = 10000;
const int BUFFER_INCREMENT_SIZE = 2500;
const color LINKCOLOR = color(0.3, 0.5, 0.9, 1.0);
ScriptEditorWindow editorWindow;
const uint FILEINFO_COMPRESSEDSIZE_UNKNOWN = uint(-1);

// Config:
// -------
Expand Down Expand Up @@ -212,7 +213,7 @@ class ScriptEditorWindow
// Make sure there's always a tab open ()
if (tabs.length() == 0)
{
this.addTab("Welcome", TUT_SCRIPT);
this.addTab("Tutorial.as", TUT_SCRIPT);
this.currentTab = 0;
}
else
Expand Down Expand Up @@ -284,28 +285,33 @@ class ScriptEditorWindow
// 'OPEN FILE' menu
if (ImGui::BeginMenu("Open file"))
{
ImGui::Text("File: "+ fileNameBuf);
if (ImGui::Button("Load##localfile"))
if (!analysisDoneThisFrame)
{
this.addTab(fileNameBuf, game.loadTextResourceAsString(fileNameBuf, RGN_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
this.addRecentScript(fileNameBuf);
analysisDoneThisFrame = localScriptsRecord.advanceScriptAnalysis();
}

this.drawSelectableFileList("Recent scripts", recentScriptsRecord, /*&inout*/ fileNameBuf);
bool loadRecentFile = this.drawSelectableFileList("Recent scripts", "Load##recent", recentScriptsRecord, /*&inout*/ fileNameBuf);
ImGui::Separator();
bool loadLocalFile = this.drawSelectableFileList("Local scripts", "Load##local", localScriptsRecord, /*&inout*/ fileNameBuf);

if (!analysisDoneThisFrame)
if (loadRecentFile || loadLocalFile)
{
analysisDoneThisFrame = localScriptsRecord.advanceScriptAnalysis();
}
this.drawSelectableFileList("Local scripts", localScriptsRecord, /*&inout*/ fileNameBuf);
this.addTab(fileNameBuf, game.loadTextResourceAsString(fileNameBuf, RGN_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
this.addRecentScript(fileNameBuf);
}

ImGui::EndMenu();
}

// 'SAVE FILE' menu
if (ImGui::BeginMenu("Save file"))
{
if (!analysisDoneThisFrame)
{
analysisDoneThisFrame = localScriptsRecord.advanceScriptAnalysis();
}

if (this.saveMenuOpening)
{
saveFileNameBuf = this.tabs[this.currentTab].bufferName;
Expand All @@ -331,13 +337,10 @@ class ScriptEditorWindow
else if (this.saveFileResult == -1)
ImGui::TextColored(color(1,0.1, 0.2, 1), "Error saving file!");

this.drawSelectableFileList("Recent scripts", recentScriptsRecord, /*&inout*/ fileNameBuf);

if (!analysisDoneThisFrame)
{
analysisDoneThisFrame = localScriptsRecord.advanceScriptAnalysis();
}
this.drawSelectableFileList("Local scripts", localScriptsRecord, /*&inout*/ saveFileNameBuf);
ImGui::Separator();
this.drawSelectableFileList("Recent scripts", "Select##recent", recentScriptsRecord, /*&inout*/ fileNameBuf);
ImGui::Separator();
this.drawSelectableFileList("Local scripts", "Select##local", localScriptsRecord, /*&inout*/ saveFileNameBuf);

ImGui::EndMenu();
}
Expand All @@ -348,38 +351,36 @@ class ScriptEditorWindow

// 'EXAMPLES' menu
if (ImGui::BeginMenu("Examples"))
{
//string loadTextResourceAsString(const std::string& filename, const std::string& resource_group);
ImGui::Text("File: "+ exampleNameBuf);
if (ImGui::Button("Load##example"))
{
this.addTab(exampleNameBuf, game.loadTextResourceAsString(exampleNameBuf, RGN_RESOURCES_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
}

{
if (!analysisDoneThisFrame)
{
analysisDoneThisFrame = exampleScriptsRecord.advanceScriptAnalysis();
}
this.drawSelectableFileList("Example scripts", exampleScriptsRecord, /*&inout*/ exampleNameBuf);

bool loadExampleFile = this.drawSelectableFileList("Example scripts", "Load##example", exampleScriptsRecord, /*&inout*/ exampleNameBuf);

if (loadExampleFile)
{
this.addTab(exampleNameBuf, game.loadTextResourceAsString(exampleNameBuf, RGN_RESOURCES_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
}

ImGui::EndMenu();
}
if (ImGui::BeginMenu("Includes"))
{
//string loadTextResourceAsString(const std::string& filename, const std::string& resource_group);
ImGui::Text("File: "+ includeNameBuf);
if (ImGui::Button("Load##include"))
if (!analysisDoneThisFrame)
{
this.addTab(includeNameBuf, game.loadTextResourceAsString(includeNameBuf, RGN_RESOURCES_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
analysisDoneThisFrame = includeScriptsRecord.advanceScriptAnalysis();
}

if (!analysisDoneThisFrame)
bool loadIncludeFile = this.drawSelectableFileList("Include scripts", "Load##include", includeScriptsRecord, /*&inout*/ includeNameBuf);

if (loadIncludeFile)
{
analysisDoneThisFrame = includeScriptsRecord.advanceScriptAnalysis();
}
this.drawSelectableFileList("Include scripts", includeScriptsRecord, /*&inout*/ includeNameBuf);
this.addTab(includeNameBuf, game.loadTextResourceAsString(includeNameBuf, RGN_RESOURCES_SCRIPTS));
this.currentTab = this.tabs.length() - 1; // Focus the new tab
}

ImGui::EndMenu();
}
Expand Down Expand Up @@ -445,11 +446,10 @@ class ScriptEditorWindow
}
}

private bool drawSelectableFileList(string title, ScriptIndexerRecord@ record, string&inout out_selection)
private bool drawSelectableFileList(string title, string btnText, ScriptIndexerRecord@ record, string&inout out_selection)
{
bool retval = false;

ImGui::Separator();
ImGui::PushID(title);
ImGui::TextDisabled(title+" ("+record.fileinfos.length()+"):");
for (uint i=0; i<record.fileinfos.length(); i++)
Expand All @@ -462,7 +462,10 @@ class ScriptEditorWindow
ImGui::Bullet();
hovered = hovered || ImGui::IsItemHovered();
ImGui::SameLine(); ImGui::Text(filename); hovered = hovered || ImGui::IsItemHovered();
ImGui::SameLine(); ImGui::TextDisabled("("+formatFloat(float(size)/1000.f, "", 3, 2)+" KB)"); hovered = hovered || ImGui::IsItemHovered();
if(size != FILEINFO_COMPRESSEDSIZE_UNKNOWN)
{
ImGui::SameLine(); ImGui::TextDisabled("("+formatFloat(float(size)/1000.f, "", 3, 2)+" KB)"); hovered = hovered || ImGui::IsItemHovered();
}
ImGui::SameLine();
if (hovered && (@scriptinfo != null))
{
Expand All @@ -472,7 +475,7 @@ class ScriptEditorWindow
ImGui::TextWrapped(scriptinfo.text); ImGui::Dummy(vector2(300, 1));
ImGui::EndTooltip();
}
if (ImGui::SmallButton("Select"))
if (ImGui::SmallButton(btnText))
{
out_selection = filename;
retval = true;
Expand Down Expand Up @@ -511,7 +514,10 @@ class ScriptEditorWindow

// if we got here, the name isn't in the list yet.
// Construct a pseudo-FileInfo format so we can use common helper.
recentScriptsRecord.fileinfos.insertLast({ {'filename', fnameBuf}, {'compressedSize',-1} } );
recentScriptsRecord.fileinfos.insertLast({
{'filename', fnameBuf},
{'compressedSize',FILEINFO_COMPRESSEDSIZE_UNKNOWN}
} );
}
}

Expand Down Expand Up @@ -1177,6 +1183,11 @@ class ScriptEditorTab
int msgType = int(this.messages[i]['type']);
string msgText = string(this.messages[i]['message']);
int lineIdx = msgRow-1;
// workaround: clamp the msgRow to known line count
if (lineIdx >= bufferLinesMeta.length())
{
lineIdx = bufferLinesMeta.length() - 1;
}

// update line stats
if (msgType == asMSGTYPE_ERROR)
Expand Down

0 comments on commit 91f99be

Please sign in to comment.