changed GetAllEditors' return type to List<T>

maxijabase · maxijabase · commit 415678cf985a · 2021-12-30T18:43:56.000-03:00
diff --git a/UI/Components/EditorElement/EditorElement.xaml.cs b/UI/Components/EditorElement/EditorElement.xaml.cs
@@ -664,9 +664,9 @@ private void ParseIncludes(object sender, EventArgs e)
                     return;
                 }
 
-                var definitions = new SMDefinition[ee.Length];
+                var definitions = new SMDefinition[ee.Count];
                 List<SMFunction> currentFunctions = null;
-                for (var i = 0; i < ee.Length; ++i)
+                for (var i = 0; i < ee.Count; ++i)
                 {
                     var el = ee[i];
                     var fInfo = new FileInfo(el.FullFilePath);
@@ -794,8 +794,8 @@ public void ToggleComment(bool comment)
             var lineList = new List<DocumentLine>();
             var document = editor.TextArea.Document;
 
-            // Start undo transaction so undoing this doesn't result in undoing every single comment manually
-            document.UndoStack.StartUndoGroup();
+            // Start update so undoing this doesn't result in undoing every single comment manually
+            document.BeginUpdate();
 
             // If there's no selection, add to lineList the line the caret is standing on
             if (!selectionSegments.Any())
@@ -850,8 +850,8 @@ public void ToggleComment(bool comment)
                 }
             }
 
-            // End the undo transaction
-            document.UndoStack.EndUndoGroup();
+            // End update
+            document.EndUpdate();
         }
 
         public void ChangeCase(bool toUpper = true)
diff --git a/UI/MainWindow/MainWindowCommands.cs b/UI/MainWindow/MainWindowCommands.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -66,18 +67,18 @@ public DASMElement GetCurrentDASMElement()
         /// Gets an array of all open editor elements.
         /// </summary>
         /// <returns></returns>
-        public EditorElement[] GetAllEditorElements()
+        public List<EditorElement> GetAllEditorElements()
         {
-            return EditorReferences.Count < 1 ? null : EditorReferences.ToArray();
+            return EditorReferences.Count == 0 ? null : EditorReferences;
         }
 
         /// <summary>
         /// Gets an array of all open DASM elements.
         /// </summary>
         /// <returns></returns>
-        public DASMElement[] GetAllDASMElements()
+        public List<DASMElement> GetAllDASMElements()
         {
-            return DASMReferences.Count < 1 ? null : DASMReferences.ToArray();
+            return DASMReferences.Count < 1 ? null : DASMReferences;
         }
 
         /// <summary>
@@ -314,7 +315,7 @@ private void Command_SaveAll()
                     return;
                 }
 
-                if (editors.Length > 0)
+                if (editors.Count > 0)
                 {
                     foreach (var editor in editors)
                     {
@@ -362,7 +363,7 @@ private async void Command_CloseAll()
                 var editors = GetAllEditorElements();
                 var dasm = GetAllDASMElements();
 
-                if (editors == null || editors.Any(x => x.IsTemplateEditor) || editors.Length == 0 || editors.Any(x => x.ClosingPromptOpened))
+                if (editors == null || editors.Any(x => x.IsTemplateEditor) || editors.Count == 0 || editors.Any(x => x.ClosingPromptOpened))
                 {
                     return;
                 }
@@ -555,7 +556,7 @@ private void Command_TidyCode(bool All)
         {
             try
             {
-                var editors = All ? GetAllEditorElements() : new[] { GetCurrentEditorElement() };
+                var editors = All ? GetAllEditorElements() : new() { GetCurrentEditorElement() };
                 if (editors == null)
                 {
                     return;
diff --git a/UI/MainWindow/MainWindowMenuHandler.cs b/UI/MainWindow/MainWindowMenuHandler.cs
@@ -22,14 +22,9 @@ public partial class MainWindow
         #region Events
         private void FileMenu_Open(object sender, RoutedEventArgs e)
         {
-            var editors = GetAllEditorElements();
-            var EditorsAreOpen = false;
-            if (editors != null)
-            {
-                EditorsAreOpen = editors.Length > 0;
-            }
-
+            var EditorsAreOpen = GetAllEditorElements() != null;
             var EditorIsSelected = GetCurrentEditorElement() != null;
+
             MenuI_Save.IsEnabled = EditorIsSelected;
             MenuI_SaveAs.IsEnabled = EditorIsSelected;
             MenuI_Close.IsEnabled = EditorIsSelected;
diff --git a/UI/Windows/FindReplaceWindow.xaml.cs b/UI/Windows/FindReplaceWindow.xaml.cs
@@ -17,7 +17,7 @@ public partial class FindReplaceWindow
     {
         #region Variables
         private EditorElement _editor;
-        private EditorElement[] _allEditors;
+        private List<EditorElement> _allEditors;
         private LayoutDocumentPane _dockingPane;
         private bool IsSearchFieldOpen;
         private readonly string Selection;
@@ -228,17 +228,17 @@ private void Search()
             LoadEditorsInfo();
             var editors = GetEditorElementsForFraction(out var editorIndex);
             var regex = GetSearchRegex();
-            if (editors == null || editors.Length < 1 || editors[0] == null || regex == null)
+            if (editors == null || editors.Count < 1 || editors[0] == null || regex == null)
             {
                 return;
             }
 
             var startFileCaretOffset = 0;
             var foundOccurence = false;
 
-            for (var i = editorIndex; i < (editors.Length + editorIndex + 1); ++i)
+            for (var i = editorIndex; i < (editors.Count + editorIndex + 1); ++i)
             {
-                var index = ValueUnderMap(i, editors.Length);
+                var index = ValueUnderMap(i, editors.Count);
                 string searchText;
                 var addToOffset = 0;
                 if (i == editorIndex)
@@ -248,7 +248,7 @@ private void Search()
                     if (startFileCaretOffset < 0) { startFileCaretOffset = 0; }
                     searchText = editors[index].editor.Text.Substring(startFileCaretOffset);
                 }
-                else if (i == (editors.Length + editorIndex))
+                else if (i == (editors.Count + editorIndex))
                 {
                     searchText = startFileCaretOffset == 0 ?
                         string.Empty :
@@ -286,17 +286,17 @@ private void Replace()
             LoadEditorsInfo();
             var editors = GetEditorElementsForFraction(out var editorIndex);
             var regex = GetSearchRegex();
-            if (editors == null || editors.Length < 1 || editors[0] == null || regex == null)
+            if (editors == null || editors.Count < 1 || editors[0] == null || regex == null)
             {
                 return;
             }
 
             var replaceString = ReplaceBox.Text;
             var startFileCaretOffset = 0;
             var foundOccurence = false;
-            for (var i = editorIndex; i < (editors.Length + editorIndex + 1); ++i)
+            for (var i = editorIndex; i < (editors.Count + editorIndex + 1); ++i)
             {
-                var index = ValueUnderMap(i, editors.Length);
+                var index = ValueUnderMap(i, editors.Count);
                 string searchText;
                 var addToOffset = 0;
                 if (i == editorIndex)
@@ -306,7 +306,7 @@ private void Replace()
                     if (startFileCaretOffset < 0) { startFileCaretOffset = 0; }
                     searchText = editors[index].editor.Text.Substring(startFileCaretOffset);
                 }
-                else if (i == (editors.Length + editorIndex))
+                else if (i == (editors.Count + editorIndex))
                 {
                     searchText = startFileCaretOffset == 0 ?
                         string.Empty :
@@ -345,7 +345,7 @@ private void ReplaceAll()
             LoadEditorsInfo();
             var editors = GetEditorElementsForFraction(out _);
             var regex = GetSearchRegex();
-            if (editors == null || editors.Length < 1 || editors[0] == null || regex == null)
+            if (editors == null || editors.Count < 1 || editors[0] == null || regex == null)
             {
                 return;
             }
@@ -380,7 +380,7 @@ private void Count()
             LoadEditorsInfo();
             var editors = GetEditorElementsForFraction(out _);
             if (editors == null) { return; }
-            if (editors.Length < 1) { return; }
+            if (editors.Count < 1) { return; }
             if (editors[0] == null) { return; }
             var regex = GetSearchRegex();
             if (regex == null) { return; }
@@ -454,20 +454,20 @@ private Regex GetSearchRegex()
             return regex;
         }
 
-        private EditorElement[] GetEditorElementsForFraction(out int editorIndex)
+        private List<EditorElement> GetEditorElementsForFraction(out int editorIndex)
         {
             LoadEditorsInfo();
             var editorStartIndex = 0;
-            EditorElement[] editors;
+            List<EditorElement> editors;
             if (FindDestinies.SelectedIndex == 0)
-            { editors = new[] { _editor }; }
+            { editors = new() { _editor }; }
             else
             {
                 editors = _allEditors;
                 var checkElement = _dockingPane.SelectedContent?.Content;
                 if (checkElement is EditorElement)
                 {
-                    for (var i = 0; i < editors.Length; ++i)
+                    for (var i = 0; i < editors.Count; ++i)
                     {
                         if (editors[i] == checkElement)
                         {

Original file line number	Diff line number	Diff line change
`@@ -664,9 +664,9 @@ private void ParseIncludes(object sender, EventArgs e)`
`664`	`664`	`return;`
`665`	`665`	`}`
`666`	`666`
`667`		`- var definitions = new SMDefinition[ee.Length];`
	`667`	`+ var definitions = new SMDefinition[ee.Count];`
`668`	`668`	`List<SMFunction> currentFunctions = null;`
`669`		`- for (var i = 0; i < ee.Length; ++i)`
	`669`	`+ for (var i = 0; i < ee.Count; ++i)`
`670`	`670`	`{`
`671`	`671`	`var el = ee[i];`
`672`	`672`	`var fInfo = new FileInfo(el.FullFilePath);`
`@@ -794,8 +794,8 @@ public void ToggleComment(bool comment)`
`794`	`794`	`var lineList = new List<DocumentLine>();`
`795`	`795`	`var document = editor.TextArea.Document;`
`796`	`796`
`797`		`- // Start undo transaction so undoing this doesn't result in undoing every single comment manually`
`798`		`- document.UndoStack.StartUndoGroup();`
	`797`	`+ // Start update so undoing this doesn't result in undoing every single comment manually`
	`798`	`+ document.BeginUpdate();`
`799`	`799`
`800`	`800`	`// If there's no selection, add to lineList the line the caret is standing on`
`801`	`801`	`if (!selectionSegments.Any())`
`@@ -850,8 +850,8 @@ public void ToggleComment(bool comment)`
`850`	`850`	`}`
`851`	`851`	`}`
`852`	`852`
`853`		`- // End the undo transaction`
`854`		`- document.UndoStack.EndUndoGroup();`
	`853`	`+ // End update`
	`854`	`+ document.EndUpdate();`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`public void ChangeCase(bool toUpper = true)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.IO;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using System.Text;`
`@@ -66,18 +67,18 @@ public DASMElement GetCurrentDASMElement()`
`66`	`67`	`/// Gets an array of all open editor elements.`
`67`	`68`	`/// </summary>`
`68`	`69`	`/// <returns></returns>`
`69`		`- public EditorElement[] GetAllEditorElements()`
	`70`	`+ public List<EditorElement> GetAllEditorElements()`
`70`	`71`	`{`
`71`		`- return EditorReferences.Count < 1 ? null : EditorReferences.ToArray();`
	`72`	`+ return EditorReferences.Count == 0 ? null : EditorReferences;`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`/// <summary>`
`75`	`76`	`/// Gets an array of all open DASM elements.`
`76`	`77`	`/// </summary>`
`77`	`78`	`/// <returns></returns>`
`78`		`- public DASMElement[] GetAllDASMElements()`
	`79`	`+ public List<DASMElement> GetAllDASMElements()`
`79`	`80`	`{`
`80`		`- return DASMReferences.Count < 1 ? null : DASMReferences.ToArray();`
	`81`	`+ return DASMReferences.Count < 1 ? null : DASMReferences;`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`/// <summary>`
`@@ -314,7 +315,7 @@ private void Command_SaveAll()`
`314`	`315`	`return;`
`315`	`316`	`}`
`316`	`317`
`317`		`- if (editors.Length > 0)`
	`318`	`+ if (editors.Count > 0)`
`318`	`319`	`{`
`319`	`320`	`foreach (var editor in editors)`
`320`	`321`	`{`
`@@ -362,7 +363,7 @@ private async void Command_CloseAll()`
`362`	`363`	`var editors = GetAllEditorElements();`
`363`	`364`	`var dasm = GetAllDASMElements();`
`364`	`365`
`365`		`- if (editors == null \|\| editors.Any(x => x.IsTemplateEditor) \|\| editors.Length == 0 \|\| editors.Any(x => x.ClosingPromptOpened))`
	`366`	`+ if (editors == null \|\| editors.Any(x => x.IsTemplateEditor) \|\| editors.Count == 0 \|\| editors.Any(x => x.ClosingPromptOpened))`
`366`	`367`	`{`
`367`	`368`	`return;`
`368`	`369`	`}`
`@@ -555,7 +556,7 @@ private void Command_TidyCode(bool All)`
`555`	`556`	`{`
`556`	`557`	`try`
`557`	`558`	`{`
`558`		`- var editors = All ? GetAllEditorElements() : new[] { GetCurrentEditorElement() };`
	`559`	`+ var editors = All ? GetAllEditorElements() : new() { GetCurrentEditorElement() };`
`559`	`560`	`if (editors == null)`
`560`	`561`	`{`
`561`	`562`	`return;`