pass query helper object

Author: jjw24

Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs

@@ -143,7 +143,7 @@ private async Task<List<Result>> WindowsIndexFileContentSearchAsync(Query query,
 
             return await IndexSearch.WindowsIndexSearchAsync(
                 querySearchString,
-                queryConstructor.CreateQueryHelper,
+                queryConstructor.CreateQueryHelper(),
                 queryConstructor.QueryForFileContentSearch,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,
@@ -181,7 +181,7 @@ private async Task<List<Result>> WindowsIndexFilesAndFoldersSearchAsync(Query qu
 
             return await IndexSearch.WindowsIndexSearchAsync(
                 querySearchString,
-                queryConstructor.CreateQueryHelper,
+                queryConstructor.CreateQueryHelper(),
                 queryConstructor.QueryForAllFilesAndFolders,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,
@@ -193,8 +193,9 @@ private async Task<List<Result>> WindowsIndexTopLevelFolderSearchAsync(Query que
         {
             var queryConstructor = new QueryConstructor(Settings);
 
-            return await IndexSearch.WindowsIndexSearchAsync(path,
-                queryConstructor.CreateQueryHelper,
+            return await IndexSearch.WindowsIndexSearchAsync(
+                path,
+                queryConstructor.CreateQueryHelper(),
                 queryConstructor.QueryForTopLevelDirectorySearch,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,

Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs

@@ -86,12 +86,13 @@ internal static async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i
              return results;
         }
 
-        internal async static Task<List<Result>> WindowsIndexSearchAsync(string searchString, 
-                                                                  Func<CSearchQueryHelper> queryHelper,
-                                                                  Func<string, string> constructQuery,
-                                                                  List<AccessLink> exclusionList,
-                                                                  Query query,
-                                                                  CancellationToken token)
+        internal async static Task<List<Result>> WindowsIndexSearchAsync(
+            string searchString,
+            CSearchQueryHelper queryHelper,
+            Func<string, string> constructQuery,
+            List<AccessLink> exclusionList,
+            Query query,
+            CancellationToken token)
         {
             var regexMatch = Regex.Match(searchString, reservedStringPattern);
 
@@ -103,7 +104,7 @@ internal async static Task<List<Result>> WindowsIndexSearchAsync(string searchSt
                 var constructedQuery = constructQuery(searchString);
 
                 return RemoveResultsInExclusionList(
-                        await ExecuteWindowsIndexSearchAsync(constructedQuery, queryHelper().ConnectionString, query, token).ConfigureAwait(false),
+                        await ExecuteWindowsIndexSearchAsync(constructedQuery, queryHelper.ConnectionString, query, token).ConfigureAwait(false),
                         exclusionList,
                         token);
             }