Merge pull request #786 from Excel-DNA/CommandMenu

Fixed command menu registration

Author: govert

Source/ExcelDna.Integration/DnaLibrary.cs

@@ -325,8 +325,11 @@ internal void AutoOpen()
             RegistrationInfo.Register();
             SynchronizationManager.Install(true);
             // Register my Methods
-            var allMethods = _methods.Select(i => new Registration.ExcelFunctionRegistration(i)).Concat(_excelFunctionsExtendedRegistration);
-            ExtendedRegistration.Registration.RegisterExtended(allMethods, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
+            List<MethodInfo> commands = _methods.Where(Registration.ExcelCommandRegistration.IsCommand).ToList();
+            ExcelIntegration.RegisterMethods(commands);
+
+            var functions = _methods.Except(commands).Select(i => new Registration.ExcelFunctionRegistration(i)).Concat(_excelFunctionsExtendedRegistration);
+            ExtendedRegistration.Registration.RegisterExtended(functions, _excelParameterConversions, _excelReturnConversions, _excelFunctionProcessors, _excelFunctionExecutionHandlerSelectors);
 
             // Invoke AutoOpen in all assemblies
             foreach (AssemblyLoader.ExcelAddInInfo addIn in _addIns)

Source/ExcelDna.Integration/Registration/ExcelCommandRegistration.cs

@@ -77,5 +77,10 @@ public ExcelCommandRegistration(MethodInfo methodInfo)
                 CommandAttribute = new ExcelCommandAttribute { Name = methodInfo.Name };
             }
         }
+
+        internal static bool IsCommand(MethodInfo methodInfo)
+        {
+            return methodInfo.GetCustomAttribute<ExcelCommandAttribute>() != null;
+        }
     }
 }

Source/ExcelDna.Integration/Registration/ExcelRegistration.cs

@@ -54,7 +54,7 @@ public static IEnumerable<ExcelCommandRegistration> GetExcelCommands()
             return from ass in ExcelIntegration.GetExportedAssemblies()
                    from typ in ass.GetTypes()
                    from mi in typ.GetMethods(BindingFlags.Public | BindingFlags.Static)
-                   where mi.GetCustomAttribute<ExcelCommandAttribute>() != null
+                   where ExcelCommandRegistration.IsCommand(mi)
                    select new ExcelCommandRegistration(mi);
         }
 

Source/Tests/ExcelDna.AddIn.RuntimeTests/MyFunctions.cs

@@ -7,6 +7,12 @@ namespace ExcelDna.AddIn.RuntimeTests
 {
     public class MyFunctions
     {
+        [ExcelCommand(MenuText = "MyCommandHello")]
+        public static void MyCommandHello()
+        {
+            Logger.Log("Hello command.");
+        }
+
         [ExcelFunction]
         public static string SayHello(string name)
         {

Source/Tests/ExcelDna.RuntimeTests/UI.cs

@@ -0,0 +1,53 @@
+using ExcelDna.Integration;
+using Microsoft.Office.Core;
+using Microsoft.Office.Interop.Excel;
+using Range = Microsoft.Office.Interop.Excel.Range;
+
+namespace ExcelDna.RuntimeTests
+{
+    public class UI
+    {
+        [ExcelFact(Workbook = "", AddIn = AddInPath.RuntimeTests)]
+        public void Command()
+        {
+            CommandBarPopup? menu = FindPopupMenu("ExcelDna.AddIn.RuntimeTests add-in");
+            Assert.NotNull(menu);
+
+            CommandBarButton? button = FindButton(menu, "MyCommandHello");
+            Assert.NotNull(button);
+
+            button.Execute();
+
+            Range functionRange = ((Worksheet)ExcelDna.Testing.Util.Workbook.Sheets[1]).Range["B1"];
+            functionRange.Formula = "=MyFunctionExecutionLog()";
+            Assert.True(functionRange.Value.ToString().Contains("Hello command."));
+        }
+
+        private static CommandBarPopup? FindPopupMenu(string name)
+        {
+            var app = (Microsoft.Office.Interop.Excel.Application)ExcelDnaUtil.Application;
+            var controls = app.CommandBars[1].Controls;
+            for (int i = 1; i <= controls.Count; i++)
+            {
+                CommandBarControl control = controls[i];
+                if (control.Caption == name && control is CommandBarPopup menu)
+                    return menu;
+            }
+
+            return null;
+        }
+
+        private static CommandBarButton? FindButton(CommandBarPopup menu, string name)
+        {
+            CommandBarControls menuControls = menu.Controls;
+            for (int i = 1; i <= menuControls.Count; i++)
+            {
+                CommandBarControl control = menuControls[i];
+                if (control.Caption == name && control is CommandBarButton button)
+                    return button;
+            }
+
+            return null;
+        }
+    }
+}