Skip to content

Small Cleanup in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs #2334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BioTomateDE wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Small Cleanup in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs #2334

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38877b4
Improve BuiltinList
Feb 10, 2026
d553d54
Update BuiltinList.cs
Feb 10, 2026
393869f
Merge branch 'master' into master
Mar 1, 2026
aa6c01c
small cleanup in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs
Mar 12, 2026
89f4969
Merge branch 'master' into cleanup1
BioTomateDE Apr 23, 2026
1ed8189
Merge branch 'master' into cleanup1
BioTomateDE Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 98 additions & 72 deletions UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using UndertaleModLib;
using UndertaleModLib.Decompiler;
using UndertaleModLib.Models;
using Underanalyzer.Decompiler;

namespace UndertaleModTool.Windows
{
Expand Down Expand Up @@ -52,16 +53,16 @@
{
InitializeComponent();

if (query is not null)
{
if (query.Length > 256 || query.Count(x => x == '\n') > 16)
return; // Ignore if the query is longer than 256 characters or 16 lines.
InAssemblyCheckBox.IsChecked = inAssembly;

SearchTextBox.Text = query;
SearchTextBox.SelectAll();
if (query is null) return;
if (query.Length > 256 || query.Count(x => x == '\n') > 16) {
this.ShowError("Query is too long (Maximum of 256 chars / 16 lines)");
return;
}

InAssemblyCheckBox.IsChecked = inAssembly;
SearchTextBox.Text = query;
SearchTextBox.SelectAll();
}

private async void SearchButton_Click(object sender, RoutedEventArgs e)
Expand All @@ -73,7 +74,13 @@
{
// TODO: Allow this be cancelled, probably make loader inside this window itself.

if (mainWindow.Data == null)
if (isSearchInProgress)
{
this.ShowError("Can't search while another search is in progress.");
return;
}

if (mainWindow.Data is null)
{
this.ShowError("No data.win loaded.");
return;
Expand All @@ -85,16 +92,11 @@
return;
}

text = SearchTextBox.Text.Replace("\r\n", "\n");

if (String.IsNullOrEmpty(text))
return;

if (isSearchInProgress)
{
this.ShowError("Can't search while another search is in progress.");
text = SearchTextBox.Text;
if (String.IsNullOrEmpty(text)) {
return;
}
text = text.Replace("\r\n", "\n");

isCaseSensitive = CaseSensitiveCheckBox.IsChecked ?? false;
isRegexSearch = RegexSearchCheckBox.IsChecked ?? false;
Expand All @@ -103,23 +105,22 @@

bool filterByName = FilterByNameExpander.IsExpanded;
bool nameIsCaseSensitive, nameIsRegex;
string name;

IList<UndertaleCode> codeEntriesToSearch = mainWindow.Data.Code;

if (isRegexSearch)
{
RegexOptions options = RegexOptions.Compiled;
if (!isCaseSensitive)
{
options |= RegexOptions.IgnoreCase;
}
if (isMultilineRegex)
{
options |= RegexOptions.Multiline;
}
try
{
RegexOptions options = RegexOptions.Compiled;
if (!isCaseSensitive)
{
options |= RegexOptions.IgnoreCase;
}
if (isMultilineRegex)
{
options |= RegexOptions.Multiline;
}
keywordRegex = new(text, options);
}
catch (ArgumentException e)
Expand All @@ -129,36 +130,39 @@
}
}

if (filterByName)
if (filterByName && NameFilterTextBox.Text is string name && name != "")
{
name = NameFilterTextBox.Text;
if (!String.IsNullOrEmpty(name))
nameIsCaseSensitive = NameCaseSensitiveCheckBox.IsChecked ?? false;
nameIsRegex = NameRegexSearchCheckBox.IsChecked ?? false;

if (nameIsRegex)
{
nameIsCaseSensitive = NameCaseSensitiveCheckBox.IsChecked ?? false;
nameIsRegex = NameRegexSearchCheckBox.IsChecked ?? false;
RegexOptions options = new();
if (!nameIsCaseSensitive) {
options |= RegexOptions.IgnoreCase;
}

if (nameIsRegex)
try
{
try
{
nameRegex = new(name, nameIsCaseSensitive ? RegexOptions.Compiled : RegexOptions.Compiled | RegexOptions.IgnoreCase);
codeEntriesToSearch = mainWindow.Data.Code.Where(c => !String.IsNullOrEmpty(c.Name.Content)
&& nameRegex.IsMatch(c.Name.Content))
.ToList();
}
catch (ArgumentException e)
{
this.ShowError($"Invalid name Regex: {e.Message}");
filterByName = false;
}
nameRegex = new(name, options);
}
else
catch (ArgumentException e)
{
var comparison = nameIsCaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
codeEntriesToSearch = mainWindow.Data.Code.Where(c => !String.IsNullOrEmpty(c.Name.Content)
&& c.Name.Content.Contains(name, comparison))
.ToList();
this.ShowError($"Invalid name Regex: {e.Message}");
}

codeEntriesToSearch = mainWindow.Data.Code
.Where(code => !String.IsNullOrEmpty(code?.Name?.Content))
.Where(code => nameRegex.IsMatch(code.Name.Content))
.ToList();
}
else
{
var cmp = nameIsCaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
codeEntriesToSearch = mainWindow.Data.Code
.Where(code => !String.IsNullOrEmpty(code?.Name?.Content))
.Where(code => code.Name.Content.Contains(name, cmp))
.ToList();
}
}

Expand All @@ -169,7 +173,7 @@
}

mainWindow.IsEnabled = false;
this.IsEnabled = false;
IsEnabled = false;

isSearchInProgress = true;

Expand Down Expand Up @@ -228,21 +232,44 @@

private void SearchInUndertaleCode(UndertaleCode code)
{
try
{
if (code is not null && code.ParentEntry is null)
if (code is null) return;

// Child code entries do not contain any instructions.
if (code.ParentEntry is not null) return;

UndertaleData data = mainWindow.Data;

// TODO: Look at specific exceptions

if (isInAssembly) {
try
{
var codeText = isInAssembly
? code.Disassemble(mainWindow.Data.Variables, mainWindow.Data.CodeLocals?.For(code), mainWindow.Data.CodeLocals is null)
: GetCodeString(code);
SearchInCodeText(code.Name.Content, codeText);
}

catch (Exception)
{
failedList.Add(code.Name.Content);
}
}
// TODO: Look at specific exceptions
catch (Exception)
else
{
failedList.Add(code.Name.Content);
try
{

var codeText = TryGetProfileModeGML(code.Name.Content);

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, false) 

The name 'TryGetProfileModeGML' does not exist in the current context

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, false) 

The name 'TryGetProfileModeGML' does not exist in the current context

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, false) 

The name 'TryGetProfileModeGML' does not exist in the current context

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, true) 

The name 'TryGetProfileModeGML' does not exist in the current context

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, true) 

The name 'TryGetProfileModeGML' does not exist in the current context

Check failure on line 262 in UndertaleModTool/Windows/SearchInCodeWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / build_gui (windows-latest, Debug, false, true) 

The name 'TryGetProfileModeGML' does not exist in the current context
if (codeText is null) {
DecompileContext ctx = new(decompileContext, code, data.ToolInfo.DecompilerSettings);
codeText = ctx.DecompileToString();
}
SearchInCodeText(code.Name.Content, codeText);
}
catch (Exception)
{
failedList.Add(code.Name.Content);
}
}

Interlocked.Increment(ref progressCount);
Expand All @@ -263,10 +290,10 @@
}
else
{
StringComparison comparisonType = isCaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
StringComparison cmp = isCaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;

int index = 0;
while ((index = codeText.IndexOf(text, index, comparisonType)) != -1)
while ((index = codeText.IndexOf(text, index, cmp)) != -1)
{
results.Add(index);
index += text.Length;
Expand Down Expand Up @@ -320,22 +347,14 @@

private void SortResults()
{
string[] codeNames = mainWindow.Data.Code.Select(x => x.Name.Content).ToArray();
string[] codeNames = mainWindow.Data.Code.Select(c => c.Name.Content).ToArray();

resultsDictSorted = resultsDict.OrderBy(c => Array.IndexOf(codeNames, c.Key));
failedListSorted = failedList.OrderBy(c => Array.IndexOf(codeNames, c));
}

public void ShowResults()
{
static string GetWordEnding(int quantity, bool isResults)
{
if (isResults)
return quantity != 1 ? "s" : "";

return quantity != 1 ? "ies" : "y";
}

var resultsSorted = resultsDictSorted.ToArray();
var failedSorted = failedListSorted.ToArray();
foreach (var result in resultsSorted)
Expand All @@ -347,10 +366,17 @@
}
}

string str = $"{resultCount} result{GetWordEnding(resultCount, true)} found in {resultsSorted.Length} code entr{GetWordEnding(resultsSorted.Length, false)}.";
if (failedSorted.Length > 0)
int codeEntryCount = resultsSorted.Length;
int failedCount = failedSorted.Length;

string wResults = resultCount == 1 ? "result" : "results";
string wEntries = codeEntryCount == 1 ? "entry" : "entries";
string wEntriesFailed = failedCount == 1 ? "entry" : "entries";

string str = $"{resultCount} {wResults} found in {codeEntryCount} code {wEntries}.";
if (failedCount > 0)
{
str += $" {failedSorted.Length} code entr{GetWordEnding(failedSorted.Length, false)} with an error.";
str += $" {failedCount} code {wEntriesFailed} encountered errors while searching.";
}
StatusBarTextBlock.Text = str;
}
Expand Down Expand Up @@ -434,7 +460,7 @@
{
OpenSelectedListViewItem();
e.Handled = true;
}
}
}

private void MenuItemOpen_Click(object sender, RoutedEventArgs e)
Expand Down