Merge pull request #537 from Flow-Launcher/ContextMenuNullCheck

Check null for ContextMenu

Author: jjw24

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -22,7 +22,7 @@ public static class PluginManager
 
         public static List<PluginPair> AllPlugins { get; private set; }
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
-        public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new ();
+        public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
 
         public static IPublicAPI API { private set; get; }
 
@@ -33,7 +33,10 @@ public static class PluginManager
         /// <summary>
         /// Directories that will hold Flow Launcher plugin directory
         /// </summary>
-        private static readonly string[] Directories = { Constant.PreinstalledDirectory, DataLocation.PluginsDirectory };
+        private static readonly string[] Directories =
+        {
+            Constant.PreinstalledDirectory, DataLocation.PluginsDirectory
+        };
 
         private static void DeletePythonBinding()
         {
@@ -100,7 +103,7 @@ public static async Task InitializePlugins(IPublicAPI api)
                 try
                 {
                     var milliseconds = await Stopwatch.DebugAsync($"|PluginManager.InitializePlugins|Init method time cost for <{pair.Metadata.Name}>",
-                                                        () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, API)));
+                        () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, API)));
 
                     pair.Metadata.InitTime += milliseconds;
                     Log.Info(
@@ -149,7 +152,10 @@ public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
             if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))
             {
                 var plugin = NonGlobalPlugins[query.ActionKeyword];
-                return new List<PluginPair> { plugin };
+                return new List<PluginPair>
+                {
+                    plugin
+                };
             }
             else
             {
@@ -228,7 +234,7 @@ public static List<Result> GetContextMenusForPlugin(Result result)
 
                 try
                 {
-                    results = plugin.LoadContextMenus(result);
+                    results = plugin.LoadContextMenus(result) ?? results;
                     foreach (var r in results)
                     {
                         r.PluginDirectory = pluginPair.Metadata.PluginDirectory;
@@ -305,4 +311,4 @@ public static void ReplaceActionKeyword(string id, string oldActionKeyword, stri
             }
         }
     }
-}
+}