Merge pull request #1843 from UnderminersTeam/fix-local-var-highlighting

Fix local variable syntax highlighting getting reset when switching tabs
UnderminersTeam · Jul 23, 2024 · c7573d1 · c7573d1
2 parents 1291e79 + 6ffdecb
commit c7573d1
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/UndertaleModTool/Editors/UndertaleCodeEditor.xaml.cs b/UndertaleModTool/Editors/UndertaleCodeEditor.xaml.cs
@@ -48,7 +48,7 @@ public partial class UndertaleCodeEditor : DataUserControl
 
         public UndertaleCode CurrentDisassembled = null;
         public UndertaleCode CurrentDecompiled = null;
-        public List<string> CurrentLocals = null;
+        public List<string> CurrentLocals = new();
         public string ProfileHash = mainWindow.ProfileHash;
         public string MainPath = Path.Combine(Settings.ProfilesFolder, mainWindow.ProfileHash, "Main");
         public string TempPath = Path.Combine(Settings.ProfilesFolder, mainWindow.ProfileHash, "Temp");
@@ -249,6 +249,11 @@ private void FillInCodeViewer(bool overrideFirst = false)
                 else
                     _ = DecompileCode(code, true);
             }
+            if (DecompiledTab.IsSelected)
+            {
+                // Re-populate local variables when in decompiled code, fixing #1320
+                PopulateCurrentLocals(mainWindow.Data, code);
+            }
         }
 
         private async void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -525,7 +530,7 @@ private void DisassembleCode(UndertaleCode code, bool first)
                     var data = mainWindow.Data;
                     text = code.Disassemble(data.Variables, data.CodeLocals.For(code));
 
-                    CurrentLocals = new List<string>();
+                    CurrentLocals.Clear();
                 }
                 catch (Exception ex)
                 {
@@ -784,14 +789,7 @@ private async Task DecompileCode(UndertaleCode code, bool first, LoaderDialog ex
                         else if (decompiled != null)
                         {
                             DecompiledEditor.Document.Text = decompiled;
-                            CurrentLocals = new List<string>();
-
-                            var locals = dataa.CodeLocals.ByName(code.Name.Content);
-                            if (locals != null)
-                            {
-                                foreach (var local in locals.Locals)
-                                    CurrentLocals.Add(local.Name.Content);
-                            }
+                            PopulateCurrentLocals(dataa, code);
 
                             RestoreCaretPosition(DecompiledEditor, currLine, currColumn, scrollPos);
 
@@ -825,6 +823,19 @@ private async Task DecompileCode(UndertaleCode code, bool first, LoaderDialog ex
             }
         }
 
+        private void PopulateCurrentLocals(UndertaleData data, UndertaleCode code)
+        {
+            CurrentLocals.Clear();
+
+            // Look up locals for given code entry's name, for syntax highlighting
+            var locals = data.CodeLocals.ByName(code.Name.Content);
+            if (locals != null)
+            {
+                foreach (var local in locals.Locals)
+                    CurrentLocals.Add(local.Name.Content);
+            }
+        }
+
         private void DecompiledEditor_GotFocus(object sender, RoutedEventArgs e)
         {
             if (DecompiledEditor.IsReadOnly)