From 029b892b4374fb44405012dc8c83602220ba5c0f Mon Sep 17 00:00:00 2001 From: Steven He Date: Thu, 13 Feb 2020 14:20:56 +0800 Subject: [PATCH] Fixed tests --- TypedocConverter.Test/test.expected | 4 ++-- TypedocConverter/EnumParser.fs | 2 +- TypedocConverter/Helpers.fs | 2 +- TypedocConverter/TypeAliasParser.fs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TypedocConverter.Test/test.expected b/TypedocConverter.Test/test.expected index 3561f26..a8318df 100644 --- a/TypedocConverter.Test/test.expected +++ b/TypedocConverter.Test/test.expected @@ -149,7 +149,7 @@ namespace TypedocConverter.Test "A" => UnionStr.A, "B" => UnionStr.B, "C" => UnionStr.C, - "Other" => UnionStr.Other, + "other" => UnionStr.Other, _ => throw new System.Exception("Cannot unmarshal type UnionStr") }, _ => throw new System.Exception("Cannot unmarshal type UnionStr") @@ -163,7 +163,7 @@ namespace TypedocConverter.Test case UnionStr.A: serializer.Serialize(writer, "A"); return; case UnionStr.B: serializer.Serialize(writer, "B"); return; case UnionStr.C: serializer.Serialize(writer, "C"); return; - case UnionStr.Other: serializer.Serialize(writer, "Other"); return; + case UnionStr.Other: serializer.Serialize(writer, "other"); return; default: break; } throw new System.Exception("Cannot marshal type UnionStr"); diff --git a/TypedocConverter/EnumParser.fs b/TypedocConverter/EnumParser.fs index 348713c..1487472 100644 --- a/TypedocConverter/EnumParser.fs +++ b/TypedocConverter/EnumParser.fs @@ -45,7 +45,7 @@ let parseEnum (section: string) (node: Reflection): Entity = | _ -> "" let mutable intValue = 0L match x.DefaultValue with - | Some value -> if Int64.TryParse(value, &intValue) then { Comment = comment; Name = toPascalCase x.Name; Value = Some intValue; } + | Some value -> if Int64.TryParse(value, &intValue) then { Comment = comment; Name = x.Name; Value = Some intValue; } else match getEnumReferencedValue values value x.Name with | Some t -> { Comment = comment; Name = x.Name; Value = Some (int64 t); } | _ -> { Comment = comment; Name = x.Name; Value = None; } diff --git a/TypedocConverter/Helpers.fs b/TypedocConverter/Helpers.fs index 75cfaed..ab2ab7e 100644 --- a/TypedocConverter/Helpers.fs +++ b/TypedocConverter/Helpers.fs @@ -198,7 +198,7 @@ and getGenericTypeParameters (nodes: Reflection list) = // TODO: generate consta |> List.map (fun x -> x.Name) types |> List.map (fun x -> {| Type = x; Constraint = "" |}) and typeSorter typeA typeB = - let typesOrder = ["array"; "tuple"; "reference"; "intrinsic"] + let typesOrder = ["array"; "tuple"; "reference"; "reflection"; "stringLiteral"; "intrinsic"] let indexA = typesOrder |> List.tryFindIndex (fun x -> x = typeA.Type) let indexB = typesOrder |> List.tryFindIndex (fun x -> x = typeB.Type) match (indexA, indexB) with diff --git a/TypedocConverter/TypeAliasParser.fs b/TypedocConverter/TypeAliasParser.fs index 399c027..9b6c14b 100644 --- a/TypedocConverter/TypeAliasParser.fs +++ b/TypedocConverter/TypeAliasParser.fs @@ -18,7 +18,7 @@ let parseUnionTypeAlias (section: string) (node: Reflection) (nodes: Type list): match x.Value with | Some value -> [{ - Name = toPascalCase value + Name = value Comment = "///\n" + toCommentText value + "\n///" Value = None }]