From c7c5990c2e12846667fb2031aece8acb6ee0faf0 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 21:49:26 +1100
Subject: [PATCH] fix edge bookmark loading

---
 .../ChromeBookmarkLoader.cs                   |  2 +-
 .../EdgeBookmarkLoader.cs                     | 21 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
index d7cfcaf6a..ec6f8423d 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
@@ -17,7 +17,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
         private List<Bookmark> LoadChromeBookmarks()
         {
             var bookmarks = new List<Bookmark>();
-            String platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome\User Data"), "Google Chrome"));
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome SxS\User Data"), "Google Chrome Canary"));
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Chromium\User Data"), "Chromium"));
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
index d982ee99e..276f6368e 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
@@ -10,22 +10,17 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
 {
     public class EdgeBookmarkLoader : ChromiumBookmarkLoader
     {
-
-        private readonly List<Bookmark> _bookmarks = new();
-
-        private void LoadEdgeBookmarks()
+        private List<Bookmark> LoadEdgeBookmarks()
         {
+            var bookmarks = new List<Bookmark>();
             var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge");
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev");
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary");
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge"));
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev"));
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary"));
+
+            return bookmarks;
         }
         
-        public override List<Bookmark> GetBookmarks()
-        {
-            _bookmarks.Clear();
-            LoadEdgeBookmarks();
-            return _bookmarks;
-        }
+        public override List<Bookmark> GetBookmarks() => LoadEdgeBookmarks();
     }
 }
\ No newline at end of file