Fix highlighting on load

SPCodeOrg · Oct 27, 2020 · 61e2905 · 61e2905
1 parent 263b686
commit 61e2905
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/UI/Components/EditorElement.xaml.cs b/UI/Components/EditorElement.xaml.cs
@@ -91,6 +91,8 @@ public EditorElement(string filePath)
 
             editor.PreviewMouseWheel += PrevMouseWheel;
             editor.MouseDown += editor_MouseDown;
+            editor.Loaded += editor_Loaded;
+
             editor.TextArea.TextEntered += TextArea_TextEntered;
             editor.TextArea.TextEntering += TextArea_TextEntering;
             var fInfo = new FileInfo(filePath);
@@ -137,7 +139,6 @@ public EditorElement(string filePath)
 
             colorizeSelection = new ColorizeSelection();
             editor.TextArea.TextView.LineTransformers.Add(colorizeSelection);
-            ParseIncludes(null, null);
 
             LoadAutoCompletes();
 
@@ -174,6 +175,11 @@ public EditorElement(string filePath)
             CompileBox.IsChecked = filePath.EndsWith(".sp");
         }
 
+        private void editor_Loaded(object sender, RoutedEventArgs e)
+        {
+            ParseIncludes(sender, e);
+        }
+
         public string FullFilePath
         {
             get => _FullFilePath;