Merge pull request #150 from mcon/or-spaced-attribute-to-tutorial

`EqualsAssignmentOrSpaced` was broken with option types
fsprojects · Jun 8, 2020 · e120d5c · e120d5c
2 parents 8ebd85d + 78566ea
commit e120d5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/Argu/Parsers/Cli.fs b/src/Argu/Parsers/Cli.fs
@@ -160,6 +160,15 @@ type CliParseState =
         Reader : CliTokenReader
     }
 
+let private parseOptionalWithoutAssignment<'T> field state argInfo =
+    match state.Reader.GetNextToken true argInfo with
+    | UnrecognizedOrArgument tok ->
+        let argument = try Some(field.Parser tok :?> 'T) with _ -> None
+        match argument with Some _ -> state.Reader.MoveNext() | None -> ()
+        argument :> obj
+
+    | _ -> Option<'T>.None :> obj
+
 /// parse the next command line argument and append to state
 let rec private parseCommandLinePartial (state : CliParseState) (argInfo : UnionArgInfo) (aggregator : CliParseResultAggregator) =
     state.Reader.BeginCliSegment()
@@ -365,7 +374,8 @@ let rec private parseCommandLinePartial (state : CliParseState) (argInfo : Union
             let optArgument = existential.Accept { new IFunc<obj> with
                 member __.Invoke<'T> () =
                     match assignment with
-                    | NoAssignment -> Option<'T>.None :> obj
+                    | NoAssignment ->
+                        parseOptionalWithoutAssignment<'T> field state argInfo
                     | Assignment(_,_,eqp) ->
                         let argument =
                             try field.Parser eqp
@@ -380,13 +390,7 @@ let rec private parseCommandLinePartial (state : CliParseState) (argInfo : Union
         | OptionalParam(existential, field) ->
             let optArgument = existential.Accept { new IFunc<obj> with
                 member __.Invoke<'T> () =
-                    match state.Reader.GetNextToken true argInfo with
-                    | UnrecognizedOrArgument tok ->
-                        let argument = try Some(field.Parser tok :?> 'T) with _ -> None
-                        match argument with Some _ -> state.Reader.MoveNext() | None -> ()
-                        argument :> obj
-
-                    | _ -> Option<'T>.None :> obj }
+                    parseOptionalWithoutAssignment<'T> field state argInfo }
 
             aggregator.AppendResult caseInfo name [| optArgument |]
 

diff --git a/tests/Argu.Tests/Tests.fs b/tests/Argu.Tests/Tests.fs
@@ -78,6 +78,7 @@ module ``Argu Tests Main List`` =
         | [<EqualsAssignment>] Env of key:string * value:string
         | [<EqualsAssignment>] Dir of path:string
         | [<EqualsAssignmentOrSpaced>] Flex_Equals_Assignment of string
+        | [<EqualsAssignmentOrSpaced>] Flex_Equals_Assignment_With_Option of string option
         | [<ColonAssignmentOrSpaced>] Flex_Colon_Assignment of string
         | [<First>] First_Parameter of string
         | [<Last>] Last_Parameter of string
@@ -106,6 +107,7 @@ module ``Argu Tests Main List`` =
                 | Data _ -> "pass raw data in base64 format."
                 | Dir _ -> "Project directory to place the config & database in."
                 | Flex_Equals_Assignment _ -> "An equals assignment which can also be used with a space separator"
+                | Flex_Equals_Assignment_With_Option _ -> "Flex_Equals_Assignment but with optional parameter type"
                 | Flex_Colon_Assignment _ -> "A colon assignment which can also be used with a space separator"
                 | Log_Level _ -> "set the log level."
                 | Detach _ -> "detach daemon from console."
@@ -326,6 +328,11 @@ module ``Argu Tests Main List`` =
     let ``Parse equals or space assignment with space`` () =
         let result = parser.Parse([|"--flex-equals-assignment"; "../../my-relative-path"; "--dir==foo"|], ignoreMissing = true)
         test <@ result.GetResult Flex_Equals_Assignment = "../../my-relative-path" @>
+
+    [<Fact>]
+    let ``Parse equals or space assignment with space and optional type`` () =
+        let result = parser.Parse([|"--flex-equals-assignment-with-option"; "../../my-relative-path"; "--dir==foo"|], ignoreMissing = true)
+        test <@ result.GetResult Flex_Equals_Assignment_With_Option = Some "../../my-relative-path" @>
 
     [<Fact>]
     let ``Parse colon or space assignment with colon`` () =