fix: Exceptions in HistoryHelper

sboulema · Nov 26, 2021 · 826c9ab · 826c9ab
1 parent 226da6b
commit 826c9ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CodeNav.Shared/Helpers/HighlightHelper.cs b/CodeNav.Shared/Helpers/HighlightHelper.cs
@@ -217,7 +217,7 @@ private static CodeItem FindCodeItem(IEnumerable<CodeItem> items, string id)
         {
             foreach (var item in items)
             {
-                if (item.Id.Equals(id))
+                if (item.Id == id)
                 {
                     return item;
                 }

diff --git a/CodeNav.Shared/Helpers/HistoryHelper.cs b/CodeNav.Shared/Helpers/HistoryHelper.cs
@@ -37,17 +37,16 @@ public static void AddItemToHistory(CodeItem item)
             var model = item.Control.CodeDocumentViewModel;
 
             // Clear current indicators
-            model.HistoryItems
-                .Where(i => i != null)
-                .ToList()
-                .ForEach(i => i.StatusMonikerVisibility = Visibility.Collapsed);
+            model.HistoryItems.RemoveAll(i => i == null);
+            model.HistoryItems.ForEach(i => i.StatusMonikerVisibility = Visibility.Collapsed);
 
             // Add new indicator, only keep the five latest history items
-            model.HistoryItems.RemoveAll(i => i.Id.Equals(item.Id));
+            model.HistoryItems.RemoveAll(i => i.Id == item.Id);
             model.HistoryItems.Insert(0, item);
             model.HistoryItems = model.HistoryItems.Take(MaxHistoryItems).ToList();
 
             SolutionStorageHelper.SaveToSolutionStorage(model).FireAndForget();
+
             ApplyHistoryIndicator(model);
         }
 
@@ -59,7 +58,7 @@ public static void ApplyHistoryIndicator(CodeDocumentViewModel model)
 
                 var codeItem = model.CodeDocument
                     .Flatten()
-                    .FirstOrDefault(item => item.Id.Equals(historyItem.Id));
+                    .FirstOrDefault(item => item.Id == historyItem.Id);
 
                 if (codeItem == null)
                 {