Do not generate logical type names like "MyNamespace.Test,"

dotnet · Feb 4, 2015 · 6cc3227 · 6cc3227
1 parent b40d937
commit 6cc3227
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs b/src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs
@@ -19,7 +19,7 @@ type ManglingNamesOfProvidedTypesWithSingleParameter() =
     member this.MangleWithDefaultValue() = 
         let mangled = 
             PrettyNaming.computeMangledNameWithoutDefaultArgValues("MyNamespace.Test", [| "xyz" |], [| "Foo", Some "xyz" |])
-        Assert.AreEqual("MyNamespace.Test,", mangled)
+        Assert.AreEqual("MyNamespace.Test", mangled)
 
     [<Test>]
     member this.DemangleNonDefaultValue() = 
@@ -29,11 +29,16 @@ type ManglingNamesOfProvidedTypesWithSingleParameter() =
 
     [<Test>]
     member this.DemangleDefaultValue() = 
-        // If all provided parameters are the default value demangling fails - see #98
         let name, parameters = PrettyNaming.demangleProvidedTypeName "MyNamespace.Test,"
         Assert.AreEqual("MyNamespace.Test", name)
         Assert.AreEqual([||], parameters)
 
+    [<Test>]
+    member this.DemangleNewDefaultValue() = 
+        let name, parameters = PrettyNaming.demangleProvidedTypeName "MyNamespace.Test"
+        Assert.AreEqual("MyNamespace.Test", name)
+        Assert.AreEqual([||], parameters)
+
 [<TestFixture>]
 type ManglingNamesOfProvidedTypesWithMultipleParameter() = 
 
@@ -53,7 +58,7 @@ type ManglingNamesOfProvidedTypesWithMultipleParameter() =
                 ("MyNamespace.Test", [| "xyz"; "abc" |], 
                     [| "Foo", Some "xyz"
                        "Foo2", Some "abc" |])
-        Assert.AreEqual("MyNamespace.Test,", mangled)
+        Assert.AreEqual("MyNamespace.Test", mangled)
 
     [<Test>]
     member this.DemangleMultiParameter() = 

diff --git a/src/fsharp/PrettyNaming.fs b/src/fsharp/PrettyNaming.fs
@@ -462,7 +462,11 @@ module internal Microsoft.FSharp.Compiler.PrettyNaming
             nonDefaultArgs
             |> Array.map mangleStaticStringArg
             |> String.concat ","
-        typeLogicalName+","+nonDefaultArgsText
+
+        if nonDefaultArgsText = "" then
+            typeLogicalName
+        else
+            typeLogicalName + "," + nonDefaultArgsText
 
 
     let computeMangledNameWithoutDefaultArgValues(nm,staticArgs,defaultArgValues) =