From 9ce211c5fc62033ae567f29bba101a2e78d95616 Mon Sep 17 00:00:00 2001
From: Simon Jackson <darkside@zenithmoon.com>
Date: Sat, 10 Jun 2017 14:33:12 +0100
Subject: [PATCH] Resolves #143

Performance tweaked the existing Linq method and at the request of #143 , added a new array sort alternative.
---
 .../Controls/ComboBox/AutoCompleteComboBox.cs | 65 ++++++++++++++++---
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
index 10935cf..ae623f5 100644
--- a/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
+++ b/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs
@@ -6,6 +6,12 @@ using System.Linq;
 
 namespace UnityEngine.UI.Extensions
 {
+    public enum AutoCompleteSearchType
+    {
+        ArraySort,
+        Linq
+    }
+
     [RequireComponent(typeof(RectTransform))]
     [AddComponentMenu("UI/Extensions/AutoComplete ComboBox")]
     public class AutoCompleteComboBox : MonoBehaviour
@@ -94,7 +100,9 @@ namespace UnityEngine.UI.Extensions
 		public Color MatchingItemsRemainingTextColor = Color.black;
 		public Color NoItemsRemainingTextColor = Color.red;
 
-		private bool _selectionIsValid = false;
+        public AutoCompleteSearchType autocompleteSearchType = AutoCompleteSearchType.Linq;
+
+        private bool _selectionIsValid = false;
 
 		[System.Serializable]
 		public class SelectionChangedEvent :  UnityEngine.Events.UnityEvent<string, bool> {
@@ -169,7 +177,7 @@ namespace UnityEngine.UI.Extensions
             panelObjects = new Dictionary<string, GameObject>();
 
             _prunedPanelItems = new List<string>();
-            _panelItems = AvailableOptions.ToList();
+            _panelItems = new List<string>();
 
             RebuildPanel();
             //RedrawPanel(); - causes an initialisation failure in U5
@@ -212,15 +220,15 @@ namespace UnityEngine.UI.Extensions
         {
             //panel starts with all options
             _panelItems.Clear();
+            _prunedPanelItems.Clear();
+            panelObjects.Clear();
+
             foreach (string option in AvailableOptions)
             {
                 _panelItems.Add(option.ToLower());
             }
-            _panelItems.Sort();
 
-            _prunedPanelItems.Clear();
             List<GameObject> itemObjs = new List<GameObject>(panelObjects.Values);
-            panelObjects.Clear();
 
             int indx = 0;
             while (itemObjs.Count < AvailableOptions.Count)
@@ -396,24 +404,61 @@ namespace UnityEngine.UI.Extensions
 
         private void PruneItems(string currText)
         {
-            List<string> notToPrune = _panelItems.Where(x => x.ToLower().Contains(currText.ToLower())).ToList();
-            List<string> toPrune = _panelItems.Except(notToPrune).ToList();
+            if (autocompleteSearchType == AutoCompleteSearchType.Linq)
+            {
+                PruneItemsLinq(currText);
+            }
+            else
+            {
+                PruneItemsArray(currText);
+            }
+        }
+
+        private void PruneItemsLinq(string currText)
+        {
+            currText = currText.ToLower();
+            var toPrune = _panelItems.Where(x => !x.Contains(currText)).ToArray();
             foreach (string key in toPrune)
             {
-                //            Debug.Log("pruning key " + key);
                 panelObjects[key].SetActive(false);
                 _panelItems.Remove(key);
                 _prunedPanelItems.Add(key);
             }
 
-            List<string> toAddBack = _prunedPanelItems.Where(x => x.ToLower().Contains(currText)).ToList();
+            var toAddBack = _prunedPanelItems.Where(x => x.Contains(currText)).ToArray();
             foreach (string key in toAddBack)
             {
-                //            Debug.Log("adding back key " + key);
                 panelObjects[key].SetActive(true);
                 _panelItems.Add(key);
                 _prunedPanelItems.Remove(key);
             }
         }
+
+        //Updated to not use Linq
+        private void PruneItemsArray(string currText)
+        {
+            string _currText = currText.ToLower();
+
+            for (int i = _panelItems.Count - 1; i >= 0; i--)
+            {
+                string _item = _panelItems[i];
+                if (!_item.Contains(_currText))
+                {
+                    panelObjects[_panelItems[i]].SetActive(false);
+                    _panelItems.RemoveAt(i);
+                    _prunedPanelItems.Add(_item);
+                }
+            }
+            for (int i = _prunedPanelItems.Count - 1; i >= 0; i--)
+            {
+                string _item = _prunedPanelItems[i];
+                if (_item.Contains(_currText))
+                {
+                    panelObjects[_prunedPanelItems[i]].SetActive(true);
+                    _prunedPanelItems.RemoveAt(i);
+                    _panelItems.Add(_item);
+                }
+            }
+        }
     }
 }