Corrections to ',' and '+' escaping for type names in quotations

Author: latkin

src/absil/ilreflect.fs

@@ -324,25 +324,7 @@ type cenv =
 // [ns]            ,name -> ns+name
 // [ns;typeA;typeB],name -> ns+typeA+typeB+name
 let convTypeRefAux (cenv:cenv) (tref:ILTypeRef) = 
-
-    // If an inner nested type's name contains a space, the proper encoding is "\+" on both sides - otherwise,
-    // we use "+"
-    let rec collectPrefixParts (l : string list) (acc : string list) =
-        match l with
-        | h1 :: (h2 :: _ as tl) ->
-            collectPrefixParts tl 
-                (List.append
-                    acc
-                    [   yield h1
-                        if h1.Contains(" ") || h2.Contains(" ") then
-                            yield "\\+"
-                        else
-                            yield "+"])
-        | h :: [] -> List.append acc [h]
-        | _ -> acc
-
-    let prefix = collectPrefixParts tref.Enclosing [] |> List.fold (fun (s1 : string) (s2 : string) -> s1 + s2) ""
-    let qualifiedName = prefix + (if prefix <> "" then (if tref.Name.Contains(" ") then "\\+" else "+") else "") + tref.Name  // e.g. Name.Space.Class+NestedClass
+    let qualifiedName = (String.concat "+" (tref.Enclosing @ [ tref.Name ])).Replace(",", @"\,")
     match tref.Scope with
     | ILScopeRef.Assembly asmref ->
         let assembly = 

src/fsharp/FSharp.Core/quotations.fs

@@ -1298,8 +1298,11 @@ module Patterns =
         if System.Int32.TryParse(a, &idx) && b = ""  then
             st.referencedTypeDefs.[idx]
         else 
+            // escape commas found in type name, which are not already escaped
+            // '\' is not valid in a type name except as an escape character, so logic can be pretty simple
+            let escapedTcName = System.Text.RegularExpressions.Regex.Replace(a, @"(?<!\\),", @"\,")
             let assref = decodeAssemblyRef st b
-            mkNamedTycon (a,assref)
+            mkNamedTycon (escapedTcName, assref)
 
     let u_tyconstSpec st = 
       let tag = u_byte_as_int st