Unescape quoted reserved word in Swift Metadata dictionary

mythz · mythz · commit 71c7506e6616 · 2015-11-06T15:27:50.000-08:00
diff --git a/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs b/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs
@@ -472,8 +472,10 @@ private void AddTypeExtension(ref StringBuilderWrapper sbExt, MetadataType type,
                     }
                 }
 
-                sbExt.AppendLine("Type<{0}>.{1}(\"{2}\", get: {{ $0.{2} }}, set: {{ $0.{2} = $1 }}),".Fmt(
-                        typeName, fnName, prop.Name.SafeToken().PropertyStyle()));
+                var propName = prop.Name.SafeToken().PropertyStyle();
+                var unescapedName = propName.UnescapeReserved();
+                sbExt.AppendLine("Type<{0}>.{1}(\"{2}\", get: {{ $0.{3} }}, set: {{ $0.{3} = $1 }}),".Fmt(
+                        typeName, fnName, unescapedName, propName));
             }
             sbExt = sbExt.UnIndent();
             sbExt.AppendLine("])");
@@ -1057,6 +1059,13 @@ public static string PropertyStyle(this string name)
                 : propName;
         }
 
+        public static string UnescapeReserved(this string name)
+        {
+            return string.IsNullOrEmpty(name)
+                ? name
+                : name.TrimStart('`').TrimEnd('`');
+        }
+
         public static string AddGenericConstraints(this string typeDef)
         {
             return typeDef
diff --git a/tests/Check.ServiceInterface/NativeTypesTestService.cs b/tests/Check.ServiceInterface/NativeTypesTestService.cs
@@ -236,6 +236,15 @@ public object Any(HelloPatch request)
         {
             return new HelloVerbResponse { Result = HttpMethods.Patch };
         }
+
+        public void Any(HelloReturnVoid request)
+        {
+        }
+
+        public object Any(EnumRequest request)
+        {
+            return new EnumResponse { Operator = request.Operator };
+        }
     }
 
     public class GetUserSession : IReturn<CustomUserSession>
diff --git a/tests/Check.ServiceModel/CodeGenTestTypes.cs b/tests/Check.ServiceModel/CodeGenTestTypes.cs
@@ -544,6 +544,29 @@ public class HelloPatch : IReturn<HelloVerbResponse>, IPatch
         public int Id { get; set; }
     }
 
+    public class HelloReturnVoid : IReturnVoid
+    {
+        public int Id { get; set; }
+    }
+
+    public class EnumRequest : IReturn<EnumResponse>, IPut
+    {
+        public ScopeType Operator { get; set; }
+    }
+
+    public class EnumResponse
+    {
+        public ScopeType Operator { get; set; }
+    }
+
+    [DataContract]
+    public enum ScopeType
+    {
+        [EnumMember]
+        Global = 1,
+        [EnumMember]
+        Sale = 2,
+    }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -472,8 +472,10 @@ private void AddTypeExtension(ref StringBuilderWrapper sbExt, MetadataType type,`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`
`475`		`- sbExt.AppendLine("Type<{0}>.{1}(\"{2}\", get: {{ $0.{2} }}, set: {{ $0.{2} = $1 }}),".Fmt(`
`476`		`- typeName, fnName, prop.Name.SafeToken().PropertyStyle()));`
	`475`	`+ var propName = prop.Name.SafeToken().PropertyStyle();`
	`476`	`+ var unescapedName = propName.UnescapeReserved();`
	`477`	`+ sbExt.AppendLine("Type<{0}>.{1}(\"{2}\", get: {{ $0.{3} }}, set: {{ $0.{3} = $1 }}),".Fmt(`
	`478`	`+ typeName, fnName, unescapedName, propName));`
`477`	`479`	`}`
`478`	`480`	`sbExt = sbExt.UnIndent();`
`479`	`481`	`sbExt.AppendLine("])");`
`@@ -1057,6 +1059,13 @@ public static string PropertyStyle(this string name)`
`1057`	`1059`	`: propName;`
`1058`	`1060`	`}`
`1059`	`1061`
	`1062`	`+ public static string UnescapeReserved(this string name)`
	`1063`	`+ {`
	`1064`	`+ return string.IsNullOrEmpty(name)`
	`1065`	`+ ? name`
	`1066`	+ : name.TrimStart('`').TrimEnd('`');
	`1067`	`+ }`
	`1068`	`+`
`1060`	`1069`	`public static string AddGenericConstraints(this string typeDef)`
`1061`	`1070`	`{`
`1062`	`1071`	`return typeDef`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,15 @@ public object Any(HelloPatch request)`
`236`	`236`	`{`
`237`	`237`	`return new HelloVerbResponse { Result = HttpMethods.Patch };`
`238`	`238`	`}`
	`239`	`+`
	`240`	`+ public void Any(HelloReturnVoid request)`
	`241`	`+ {`
	`242`	`+ }`
	`243`	`+`
	`244`	`+ public object Any(EnumRequest request)`
	`245`	`+ {`
	`246`	`+ return new EnumResponse { Operator = request.Operator };`
	`247`	`+ }`
`239`	`248`	`}`
`240`	`249`
`241`	`250`	`public class GetUserSession : IReturn<CustomUserSession>`