Merge branch 'dev' into add_quickaccess_actionkeyword

Author: jjw24

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

@@ -149,7 +149,7 @@ private async Task<List<Result>> WindowsIndexFileContentSearchAsync(Query query,
 
             return await IndexSearch.WindowsIndexSearchAsync(
                 querySearchString,
-                queryConstructor.CreateQueryHelper(),
+                queryConstructor.CreateQueryHelper,
                 queryConstructor.QueryForFileContentSearch,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,
@@ -187,7 +187,7 @@ private async Task<List<Result>> WindowsIndexFilesAndFoldersSearchAsync(Query qu
 
             return await IndexSearch.WindowsIndexSearchAsync(
                 querySearchString,
-                queryConstructor.CreateQueryHelper(),
+                queryConstructor.CreateQueryHelper,
                 queryConstructor.QueryForAllFilesAndFolders,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,
@@ -201,7 +201,7 @@ private async Task<List<Result>> WindowsIndexTopLevelFolderSearchAsync(Query que
 
             return await IndexSearch.WindowsIndexSearchAsync(
                 path,
-                queryConstructor.CreateQueryHelper(),
+                queryConstructor.CreateQueryHelper,
                 queryConstructor.QueryForTopLevelDirectorySearch,
                 Settings.IndexSearchExcludedSubdirectoryPaths,
                 query,

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

@@ -88,7 +88,7 @@ internal static async Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i
 
         internal async static Task<List<Result>> WindowsIndexSearchAsync(
             string searchString,
-            CSearchQueryHelper queryHelper,
+            Func<CSearchQueryHelper> createQueryHelper,
             Func<string, string> constructQuery,
             List<AccessLink> exclusionList,
             Query query,
@@ -104,7 +104,7 @@ internal async static Task<List<Result>> WindowsIndexSearchAsync(
                 var constructedQuery = constructQuery(searchString);
 
                 return RemoveResultsInExclusionList(
-                        await ExecuteWindowsIndexSearchAsync(constructedQuery, queryHelper.ConnectionString, query, token).ConfigureAwait(false),
+                        await ExecuteWindowsIndexSearchAsync(constructedQuery, createQueryHelper().ConnectionString, query, token).ConfigureAwait(false),
                         exclusionList,
                         token);
             }