Merge branch 'dev' into update_uI_hotkey_actionkeyword

Author: jjw24

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

@@ -10,7 +10,10 @@ public static class EnvironmentVariables
     {
         internal static bool IsEnvironmentVariableSearch(string search)
         {
-            return LoadEnvironmentStringPaths().Count > 0 && search.StartsWith("%") && !search.Substring(1).Contains("%");
+            return LoadEnvironmentStringPaths().Count > 0 
+                    && search.StartsWith("%") 
+                    && search != "%%"
+                    && !search.Contains("\\");
         }
 
         internal static Dictionary<string, string> LoadEnvironmentStringPaths()

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

@@ -39,19 +39,23 @@ internal List<Result> Search(Query query)
             if (quickFolderLinks.Count > 0)
                 return quickFolderLinks;
 
-            if (string.IsNullOrEmpty(query.Search))
+            if (string.IsNullOrEmpty(querySearch))
                 return results;
 
-            if (!FilesFolders.IsLocationPathString(querySearch))
-                return WindowsIndexFilesAndFoldersSearch(query, querySearch);
-
-            var locationPath = query.Search;
+            var isEnvironmentVariable = EnvironmentVariables.IsEnvironmentVariableSearch(querySearch);
 
-            if (EnvironmentVariables.IsEnvironmentVariableSearch(locationPath))
-                return EnvironmentVariables.GetEnvironmentStringPathSuggestions(locationPath, query, context);
+            if (isEnvironmentVariable)
+                return EnvironmentVariables.GetEnvironmentStringPathSuggestions(querySearch, query, context);
 
             // Query is a location path with a full environment variable, eg. %appdata%\somefolder\
-            if (locationPath.Substring(1).Contains("%"))
+            var isEnvironmentVariablePath = querySearch.Substring(1).Contains("%\\");
+
+            if (!FilesFolders.IsLocationPathString(querySearch) && !isEnvironmentVariablePath)
+                return WindowsIndexFilesAndFoldersSearch(query, querySearch);
+
+            var locationPath = querySearch;
+
+            if (isEnvironmentVariablePath)
                 locationPath = EnvironmentVariables.TranslateEnvironmentVariablePath(locationPath);
 
             if (!FilesFolders.LocationExists(FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath)))