Merge pull request #12 from faviann/master

Moved the lowercasing of commands after overload processing
mayuki · Feb 5, 2020 · 0cc2504 · 0cc2504
2 parents 494484a + 4fb797b
commit 0cc2504
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Cocona.Core/Command/CoconaCommandProvider.cs b/src/Cocona.Core/Command/CoconaCommandProvider.cs
@@ -119,8 +119,6 @@ public CommandDescriptor CreateCommand(MethodInfo methodInfo, bool isSingleComma
             var description = commandAttr?.Description ?? string.Empty;
             var aliases = commandAttr?.Aliases ?? Array.Empty<string>();
 
-            if (_enableConvertCommandNameToLowerCase) commandName = ToCommandCase(commandName);
-
             var isPrimaryCommand = primaryCommandAttr != null;
             var isHidden = commandHiddenAttr != null;
 
@@ -253,6 +251,8 @@ public CommandDescriptor CreateCommand(MethodInfo methodInfo, bool isSingleComma
                     overloadDescriptors[i] = overloadDescriptor;
                 }
             }
+
+            if (_enableConvertCommandNameToLowerCase) commandName = ToCommandCase(commandName);
 
             var flags = ((isHidden) ? CommandFlags.Hidden : CommandFlags.None) |
                         ((isSingleCommand || isPrimaryCommand) ? CommandFlags.Primary : CommandFlags.None);

diff --git a/test/Cocona.Test/Command/CommandProvider/CommandOverloadTest.cs b/test/Cocona.Test/Command/CommandProvider/CommandOverloadTest.cs
@@ -37,6 +37,17 @@ public void Multiple_UnknownOption()
             var provider = new CoconaCommandProvider(new[] { typeof(TestCommand_Overload_Multiple_UnknownOption) });
             Assert.Throws<CoconaException>(() => provider.GetCommandCollection());
         }
+
+        [Fact]
+        public void Match_CommandName_LowerCase()
+        {
+            var provider = new CoconaCommandProvider(new[] { typeof(TestCommand_Overload_Single) }, enableConvertCommandNameToLowerCase: true);
+            var commands = provider.GetCommandCollection();
+            commands.Should().NotBeNull();
+            commands.All.Should().HaveCount(1);
+            commands.Primary.Should().NotBeNull();
+            commands.Primary.Overloads.Should().HaveCount(2);
+        }
 
         class TestCommand_Overload_Single
         {