fix Close All not working properly

In this commit I've gotten rid of the GetAllEditorElements method in favor of directly utilizing the global variable that stores the editors, since it was completely redundant. This allowed me to remove a lot of dumb null checks on what that function used to return.

Author: maxijabase

Interop/TranslationProvider.cs

@@ -171,7 +171,7 @@ public void UpdateTranslations()
             try
             {
                 // Clear temp folder before beggining
-                DirUtils.ClearSPCodeTempFolder();
+                DirHelper.ClearSPCodeTempFolder();
 
                 // Download latest release zip file
                 var wc = new WebClient();
@@ -197,7 +197,7 @@ public void UpdateTranslations()
                 }
 
                 // Delete all temp folder contents
-                DirUtils.ClearSPCodeTempFolder();
+                DirHelper.ClearSPCodeTempFolder();
 
                 // Update version to options object
                 Program.OptionsObject.TranslationsVersion = int.Parse(_latestVersion.Name);

Spcode.csproj

@@ -198,7 +198,7 @@
     </Compile>
     <Compile Include="UI\Components\EditorElement\Highlighting\BracketHighlightHelpers.cs" />
     <Compile Include="UI\Components\EditorElement\Highlighting\BracketSearchResult.cs" />
-    <Compile Include="Utils\DirUtils.cs" />
+    <Compile Include="Utils\DirHelper.cs" />
     <Compile Include="Utils\Models\ComboboxItem.cs" />
     <Compile Include="Utils\Models\Config.cs" />
     <Compile Include="Utils\Constants.cs" />

UI/Components/EditorElement/EditorElement.xaml.cs

@@ -663,21 +663,21 @@ private void ParseIncludes(object sender, EventArgs e)
                     return;
                 }
 
-                var ee = Program.MainWindow.GetAllEditorElements();
-                var ce = Program.MainWindow.GetCurrentEditorElement();
+                var editors = Program.MainWindow.EditorReferences;
+                var currentEditor = Program.MainWindow.GetCurrentEditorElement();
 
                 var caret = -1;
 
-                if (ee == null || ce == null)
+                if (!editors.Any() || currentEditor == null)
                 {
                     return;
                 }
 
-                var definitions = new List<SMDefinition>(ee.Count);
+                var definitions = new List<SMDefinition>(editors.Count);
 
                 List<SMFunction> currentFunctions = null;
 
-                foreach (var el in ee)
+                foreach (var el in editors)
                 {
                     var fInfo = new FileInfo(el.FullFilePath);
                     var text = el.editor.Document.Text;
@@ -694,7 +694,7 @@ private void ParseIncludes(object sender, EventArgs e)
                     definitions.Add(def);
 
 
-                    if (el != ce)
+                    if (el != currentEditor)
                         continue;
 
                     currentFunctions = def.Functions;
@@ -730,14 +730,14 @@ private void ParseIncludes(object sender, EventArgs e)
                     .ProduceTemporaryExpandedDefinition(definitions, caret, currentFunctions);
 
                 // Lags the hell out when typing a lot.
-                ce.editor.SyntaxHighlighting = new AeonEditorHighlighting(smDef);
+                currentEditor.editor.SyntaxHighlighting = new AeonEditorHighlighting(smDef);
 
-                foreach (var el in ee)
+                foreach (var el in editors)
                 {
-                    if (el == ce)
+                    if (el == currentEditor)
                     {
-                        Debug.Assert(ce != null, nameof(ce) + " != null");
-                        if (ce._isTooltipOpen)
+                        Debug.Assert(currentEditor != null, nameof(currentEditor) + " != null");
+                        if (currentEditor._isTooltipOpen)
                         {
                             continue;
                         }

UI/MainWindow/MainWindow.xaml.cs

@@ -262,9 +262,8 @@ private async void MetroWindow_Closing(object sender, CancelEventArgs e)
             if (!ClosingBuffer)
             {
                 // Close directly if no files need to be saved
-                var editors = GetAllEditorElements()?.ToList();
 
-                if (editors == null || (editors != null && !editors.Any(x => x.NeedsSave)) || Program.OptionsObject.ActionOnClose != ActionOnClose.Prompt)
+                if (!EditorReferences.Any() || !EditorReferences.Any(x => x.NeedsSave) || Program.OptionsObject.ActionOnClose != ActionOnClose.Prompt)
                 {
                     ClosingBuffer = true;
                     CloseProgram(true);
@@ -277,7 +276,7 @@ private async void MetroWindow_Closing(object sender, CancelEventArgs e)
                     // Build list of unsaved files to show
                     var sb = new StringBuilder();
 
-                    foreach (var editor in editors.Where(x => x.NeedsSave))
+                    foreach (var editor in EditorReferences.Where(x => x.NeedsSave))
                     {
                         sb.AppendLine($"  - {editor.Parent.Title.Substring(1)}");
                     }
@@ -345,99 +344,98 @@ public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool
         {
             outEditor = null;
             var fileInfo = new FileInfo(filePath);
-            if (fileInfo.Exists)
+
+            if (!fileInfo.Exists)
+            {
+                return false;
+            }
+
+            if (DirHelper.HasValidTextExtension(fileInfo))
             {
-                if (fileInfo.Extension == ".sp" ||
-                    fileInfo.Extension == ".inc" ||
-                    fileInfo.Extension == ".txt" ||
-                    fileInfo.Extension == ".cfg" ||
-                    fileInfo.Extension == ".ini")
+                var finalPath = fileInfo.FullName;
+                if (!DirHelper.CanAccess(finalPath))
                 {
-                    var finalPath = fileInfo.FullName;
-                    if (!DirUtils.CanAccess(finalPath))
-                    {
-                        return false;
-                    }
+                    return false;
+                }
 
-                    var editors = GetAllEditorElements();
-                    if (editors != null)
+                if (EditorReferences.Any())
+                {
+                    foreach (var editor in EditorReferences)
                     {
-                        foreach (var editor in editors)
+                        if (editor.FullFilePath == finalPath)
                         {
-                            if (editor.FullFilePath == finalPath)
+                            if (SelectMe)
                             {
-                                if (SelectMe)
-                                {
-                                    editor.Parent.IsSelected = true;
-                                    editor.editor.TextArea.Caret.Show();
-                                    EditorToFocus = editor;
-                                    SelectDocumentTimer.Start();
-                                }
-
-                                outEditor = editor;
-                                return true;
+                                editor.Parent.IsSelected = true;
+                                editor.editor.TextArea.Caret.Show();
+                                EditorToFocus = editor;
+                                SelectDocumentTimer.Start();
                             }
+
+                            outEditor = editor;
+                            return true;
                         }
                     }
+                }
 
-                    AddEditorElement(fileInfo, fileInfo.Name, SelectMe, out outEditor);
-                    if (TryOpenIncludes && Program.OptionsObject.Program_OpenCustomIncludes)
+                AddEditorElement(fileInfo, fileInfo.Name, SelectMe, out outEditor);
+                if (TryOpenIncludes && Program.OptionsObject.Program_OpenCustomIncludes)
+                {
+                    using var textReader = fileInfo.OpenText();
+                    var source = Regex.Replace(textReader.ReadToEnd(), @"/\*.*?\*/", string.Empty,
+                        RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Singleline);
+                    var regex = new Regex(@"^\s*\#include\s+((\<|"")(?<name>.+?)(\>|""))",
+                        RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Multiline);
+                    var mc = regex.Matches(source);
+                    for (var i = 0; i < mc.Count; ++i)
                     {
-                        using var textReader = fileInfo.OpenText();
-                        var source = Regex.Replace(textReader.ReadToEnd(), @"/\*.*?\*/", string.Empty,
-                            RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Singleline);
-                        var regex = new Regex(@"^\s*\#include\s+((\<|"")(?<name>.+?)(\>|""))",
-                            RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Multiline);
-                        var mc = regex.Matches(source);
-                        for (var i = 0; i < mc.Count; ++i)
+                        try
                         {
-                            try
+                            var fileName = mc[i].Groups["name"].Value;
+                            if (!(fileName.EndsWith(".inc", StringComparison.InvariantCultureIgnoreCase) ||
+                                  fileName.EndsWith(".sp", StringComparison.InvariantCultureIgnoreCase)))
                             {
-                                var fileName = mc[i].Groups["name"].Value;
-                                if (!(fileName.EndsWith(".inc", StringComparison.InvariantCultureIgnoreCase) ||
-                                      fileName.EndsWith(".sp", StringComparison.InvariantCultureIgnoreCase)))
-                                {
-                                    fileName += ".inc";
-                                }
-
-                                fileName = Path.Combine(
-                                    fileInfo.DirectoryName ?? throw new NullReferenceException(), fileName);
-                                TryLoadSourceFile(fileName, out _, false,
-                                    Program.OptionsObject.Program_OpenIncludesRecursively);
-                            }
-                            catch (Exception)
-                            {
-                                // ignored
+                                fileName += ".inc";
                             }
+
+                            fileName = Path.Combine(
+                                fileInfo.DirectoryName ?? throw new NullReferenceException(), fileName);
+                            TryLoadSourceFile(fileName, out _, false,
+                                Program.OptionsObject.Program_OpenIncludesRecursively);
+                        }
+                        catch (Exception)
+                        {
+                            // ignored
                         }
                     }
                 }
-                else if (fileInfo.Extension == ".smx")
+            }
+            else if (DirHelper.IsBinary(fileInfo))
+            {
+                if (DASMReferences.Any())
                 {
-                    var viewers = GetAllDASMElements();
-                    if (viewers != null)
+                    foreach (var dasmviewer in DASMReferences)
                     {
-                        foreach (var dasmviewer in viewers)
+                        if (dasmviewer.FilePath == fileInfo.FullName)
                         {
-                            if (dasmviewer.FilePath == fileInfo.FullName)
-                            {
-                                DockingManager.ActiveContent = dasmviewer;
-                                return true;
-                            }
+                            DockingManager.ActiveContent = dasmviewer;
+                            return true;
                         }
                     }
-                    AddDASMElement(fileInfo);
-                }
-
-                if (UseBlendoverEffect)
-                {
-                    BlendOverEffect.Begin();
                 }
+                AddDASMElement(fileInfo);
+            }
+            else
+            {
+                return false;
+            }
 
-                return true;
+            if (UseBlendoverEffect)
+            {
+                BlendOverEffect.Begin();
             }
 
-            return false;
+            return true;
         }
 
         /// <summary>
@@ -549,9 +547,8 @@ private void CloseProgram(bool saveAll)
         {
             // Save all the last open files
             var lastOpenFiles = new List<string>();
-            var editors = GetAllEditorElements()?.ToList();
 
-            editors?.ForEach(x =>
+            EditorReferences.ForEach(x =>
             {
                 if (File.Exists(x.FullFilePath))
                 {
@@ -562,11 +559,11 @@ private void CloseProgram(bool saveAll)
 
             if (saveAll)
             {
-                editors?.ForEach(x => x.Close(true));
+                EditorReferences.ForEach(x => x.Close(true));
             }
             else
             {
-                editors?.ForEach(x => x.Close(false, false));
+                EditorReferences.ForEach(x => x.Close(false, false));
             }
 
             // Kill children process from "Server Start" feature
@@ -601,7 +598,7 @@ public void RestoreMainWindow()
         public void EvaluateRTL()
         {
             FlowDirection = Program.IsRTL ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-            GetAllEditorElements()?.ForEach(x => x.EvaluateRTL());
+            EditorReferences.ForEach(x => x.EvaluateRTL());
         }
         #endregion
     }