Allow CreateScope() to override existing scope as well

mythz · mythz · commit 7dd1216dc7d1 · 2016-02-13T09:47:39.000-05:00
diff --git a/src/ServiceStack.Text/JsConfig.cs b/src/ServiceStack.Text/JsConfig.cs
@@ -31,12 +31,14 @@ public static JsConfigScope BeginScope()
             return new JsConfigScope();
         }
 
-        public static JsConfigScope CreateScope(string config)
+        public static JsConfigScope CreateScope(string config, JsConfigScope scope = null)
         {
             if (string.IsNullOrEmpty(config))
-                return null;
+                return scope;
+
+            if (scope == null)
+                scope = BeginScope();
 
-            var scope = BeginScope();
             var items = config.Split(',');
             foreach (var item in items)
             {

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,14 @@ public static JsConfigScope BeginScope()`
`31`	`31`	`return new JsConfigScope();`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static JsConfigScope CreateScope(string config)`
	`34`	`+ public static JsConfigScope CreateScope(string config, JsConfigScope scope = null)`
`35`	`35`	`{`
`36`	`36`	`if (string.IsNullOrEmpty(config))`
`37`		`- return null;`
	`37`	`+ return scope;`
	`38`	`+`
	`39`	`+ if (scope == null)`
	`40`	`+ scope = BeginScope();`
`38`	`41`
`39`		`- var scope = BeginScope();`
`40`	`42`	`var items = config.Split(',');`
`41`	`43`	`foreach (var item in items)`
`42`	`44`	`{`