Patch ArgParser to correctly throw BadArgument

devoxin · Dec 30, 2019 · bd60589 · bd60589
1 parent 753e93b
commit bd60589
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'kotlin'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group 'me.devoxin'
-version '1.5.0'
+version '1.5.1'
 sourceCompatibility = 1.8
 
 repositories {

diff --git a/src/main/kotlin/me/devoxin/flight/arguments/ArgParser.kt b/src/main/kotlin/me/devoxin/flight/arguments/ArgParser.kt
@@ -104,15 +104,14 @@ class ArgParser(
             }
         }
 
-        if (!result.isPresent && !arg.isNullable) {
+        if (!result.isPresent && !arg.isNullable && (!arg.optional || argument.isNotEmpty())) {
             throw BadArgument(arg, argument)
         }
 
         return result.orElse(null)
     }
 
     companion object {
-        private val logger = LoggerFactory.getLogger(ArgParser::class.java)
         val parsers = hashMapOf<Class<*>, Parser<*>>()
 
         fun parseArguments(cmd: CommandWrapper, ctx: Context, args: List<String>): HashMap<KParameter, Any?> {