Change SplitOnFirst/SplitOnLast to use new LeftPart/LastRightPart APIs to reduce allocs

mythz · mythz · commit d136f4c5c947 · 2016-05-23T06:16:26.000-04:00
diff --git a/src/ServiceStack.Client/ContentFormat.cs b/src/ServiceStack.Client/ContentFormat.cs
@@ -76,7 +76,7 @@ public static bool IsBinary(this string contentType)
                     return true;
             }
 
-            var primaryType = realContentType.SplitOnFirst('/')[0];
+            var primaryType = realContentType.LeftPart('/');
             switch (primaryType)
             {
                 case "image":
diff --git a/src/ServiceStack.Client/Serialization/StringMapTypeDeserializer.cs b/src/ServiceStack.Client/Serialization/StringMapTypeDeserializer.cs
@@ -130,7 +130,7 @@ public object PopulateFromMap(object instance, IDictionary<string, string> keyVa
                     if (propertySerializerEntry.PropertyType == typeof (bool))
                     {
                         //InputExtensions.cs#530 MVC Checkbox helper emits extra hidden input field, generating 2 values, first is the real value
-                        propertyTextValue = propertyTextValue.SplitOnFirst(',').First();
+                        propertyTextValue = propertyTextValue.LeftPart(',');
                     }
 
                     var value = propertySerializerEntry.PropertyParseStringFn(propertyTextValue);
diff --git a/src/ServiceStack.Client/UrlExtensions.cs b/src/ServiceStack.Client/UrlExtensions.cs
@@ -110,7 +110,7 @@ public static string GetMetadataPropertyType(this Type type)
         public static string GetOperationName(this Type type)
         {
             var typeName = type.FullName != null //can be null, e.g. generic types
-                ? type.FullName.SplitOnFirst("[[")[0]  //Generic Fullname
+                ? type.FullName.LeftPart("[[")   //Generic Fullname
                     .Replace(type.Namespace + ".", "") //Trim Namespaces
                     .Replace("+", ".") //Convert nested into normal type
                 : type.Name;
@@ -131,7 +131,7 @@ public static string ExpandTypeName(this Type type)
 
         public static string ExpandGenericTypeName(Type type)
         {
-            var nameOnly = type.Name.SplitOnFirst('`')[0];
+            var nameOnly = type.Name.LeftPart('`');
 
             var sb = StringBuilderCache.Allocate();
             foreach (var arg in type.GetGenericArguments())
diff --git a/src/ServiceStack.Razor/Compilation/CodeTransformers/DefaultCodeTransformers.cs b/src/ServiceStack.Razor/Compilation/CodeTransformers/DefaultCodeTransformers.cs
@@ -93,7 +93,7 @@ public class SetBaseType : RazorCodeTransformerBase
         private readonly string _typeName;
         public SetBaseType(string typeName, bool? isGenericType = null)
         {
-            _typeName = typeName.SplitOnLast("`")[0]; //get clean generic name without 'GenericType`1' n args suffix
+            _typeName = typeName.LastLeftPart("`"); //get clean generic name without 'GenericType`1' n args suffix
             this.isGenericType = isGenericType ?? typeName.Contains("`");
         }
 
diff --git a/src/ServiceStack.Razor/Managers/RazorViewManager.cs b/src/ServiceStack.Razor/Managers/RazorViewManager.cs
@@ -209,7 +209,7 @@ protected virtual RazorPage AddPage(RazorPage page, string pagePath = null)
             //Views should be uniquely named and stored in any deep folder structure
             if (pagePath.StartsWithIgnoreCase("views/") && !pagePath.EndsWithIgnoreCase(DefaultLayoutFile))
             {
-                var viewName = pagePath.SplitOnLast('.').First().SplitOnLast('/').Last();
+                var viewName = pagePath.LastLeftPart('.').LastRightPart('/');
                 ViewNamesMap[viewName] = pagePath;
             }
 
@@ -260,7 +260,7 @@ public virtual RazorPage GetLayoutPage(string layoutName, RazorPage page, IReque
             string contextParentDir = contextRelativePath;
             do
             {
-                contextParentDir = (contextParentDir ?? "").SplitOnLast('/').First();
+                contextParentDir = (contextParentDir ?? "").LastLeftPart('/');
 
                 var path = CombinePaths(contextParentDir, layoutFile);
                 var layoutPage = GetPage(path);
diff --git a/src/ServiceStack.Razor/RazorFormat.cs b/src/ServiceStack.Razor/RazorFormat.cs
@@ -123,7 +123,7 @@ public void Register(IAppHost appHost)
                 var loadedAssemblyNames = CompilerServices
                     .GetLoadedAssemblies()
                     .Where(x => !x.IsDynamic)
-                    .Map(x => x.FullName.SplitOnFirst(',')[0]);
+                    .Map(x => x.FullName.LeftPart(','));
 
                 foreach (var razorNamespace in appHost.Config.RazorNamespaces)
                 {
diff --git a/src/ServiceStack.Server/AutoQueryFeature.cs b/src/ServiceStack.Server/AutoQueryFeature.cs
@@ -727,7 +727,7 @@ private static void AppendTypedQueries(SqlExpression<From> q, IQueryDb dto, Dict
         {
             foreach (var entry in PropertyGetters)
             {
-                var name = entry.Key.SplitOnFirst('#')[0];
+                var name = entry.Key.LeftPart('#');
 
                 QueryDbFieldAttribute implicitQuery;
                 QueryFieldMap.TryGetValue(name, out implicitQuery);
@@ -824,7 +824,7 @@ private static void AppendUntypedQueries(SqlExpression<From> q, Dictionary<strin
         {
             foreach (var entry in dynamicParams)
             {
-                var name = entry.Key.SplitOnFirst('#')[0];
+                var name = entry.Key.LeftPart('#');
 
                 var match = GetQueryMatch(q, name, options, aliases);
                 if (match == null)
diff --git a/src/ServiceStack/AutoQueryDataFeature.cs b/src/ServiceStack/AutoQueryDataFeature.cs
@@ -1150,7 +1150,7 @@ private static void AppendTypedQueries(IDataQuery q, IQueryData dto, Dictionary<
         {
             foreach (var entry in RequestPropertyGetters)
             {
-                var name = entry.Key.SplitOnFirst('#')[0];
+                var name = entry.Key.LeftPart('#');
 
                 QueryDataField attr;
                 if (QueryFieldMap.TryGetValue(name, out attr))
@@ -1210,7 +1210,7 @@ private static void AppendUntypedQueries(IDataQuery q, Dictionary<string, string
         {
             foreach (var entry in dynamicParams)
             {
-                var name = entry.Key.SplitOnFirst('#')[0];
+                var name = entry.Key.LeftPart('#');
 
                 var match = GetQueryMatch(q, name, options, aliases);
                 if (match == null)
diff --git a/src/ServiceStack/Host/Handlers/SoapHandler.cs b/src/ServiceStack/Host/Handlers/SoapHandler.cs
@@ -329,7 +329,7 @@ protected string GetAction(Message requestMsg, string xml)
             }
 
             return xml.StartsWith("<")
-                ? xml.Substring(1, xml.IndexOf(" ") - 1).SplitOnFirst(':').Last()
+                ? xml.Substring(1, xml.IndexOf(" ") - 1).RightPart(':')
                 : null;
         }
 
diff --git a/src/ServiceStack/Host/ServiceMetadata.cs b/src/ServiceStack/Host/ServiceMetadata.cs
@@ -451,7 +451,7 @@ private static void AddReferencedTypes(MetadataType metadataType, MetadataTypes
                     }
                     else if (p.IsArray())
                     {
-                        var elType = p.Type.SplitOnFirst('[')[0];
+                        var elType = p.Type.LeftPart('[');
                         type = FindMetadataType(metadataTypes, elType);
                         if (type != null && !types.Contains(type))
                         {
diff --git a/src/ServiceStack/HttpRequestExtensions.cs b/src/ServiceStack/HttpRequestExtensions.cs
@@ -214,9 +214,11 @@ public static string GetHttpMethodOverride(this IRequest httpReq)
         public static string GetFormatModifier(this IRequest httpReq)
         {
             var format = httpReq.QueryString[Keywords.Format];
-            if (format == null) return null;
-            var parts = format.SplitOnFirst('.');
-            return parts.Length > 1 ? parts[1] : null;
+            if (format == null)
+                return null;
+
+            var pos = format.IndexOf('.');
+            return pos >= 0 ? format.Substring(pos + 1) : null;
         }
 
         public static bool HasNotModifiedSince(this IRequest httpReq, DateTime? dateTime)
@@ -628,7 +630,7 @@ public static Dictionary<string, string> GetFlattenedRequestParams(this IRequest
         public static string GetQueryStringContentType(this IRequest httpReq)
         {
             var callback = httpReq.QueryString[Keywords.Callback];
-            if (!String.IsNullOrEmpty(callback)) return MimeTypes.Json;
+            if (!string.IsNullOrEmpty(callback)) return MimeTypes.Json;
 
             var format = httpReq.QueryString[Keywords.Format];
             if (format == null)
@@ -637,11 +639,11 @@ public static string GetQueryStringContentType(this IRequest httpReq)
                 var pi = httpReq.PathInfo;
                 if (pi == null || pi.Length <= formatMaxLength) return null;
                 if (pi[0] == '/') pi = pi.Substring(1);
-                format = pi.SplitOnFirst('/')[0];
+                format = pi.LeftPart('/');
                 if (format.Length > formatMaxLength) return null;
             }
 
-            format = format.SplitOnFirst('.')[0].ToLower();
+            format = format.LeftPart('.').ToLower();
             if (format.Contains("json")) return MimeTypes.Json;
             if (format.Contains("xml")) return MimeTypes.Xml;
             if (format.Contains("jsv")) return MimeTypes.Jsv;
@@ -870,25 +872,25 @@ public static RequestAttributes GetAttributes(this IRequest request)
                 string ipAddressNumber = null;
                 if (isIpv4Address)
                 {
-                    ipAddressNumber = request.UserHostAddress.SplitOnFirst(":")[0];
+                    ipAddressNumber = request.UserHostAddress.LeftPart(":");
                 }
                 else
                 {
                     if (request.UserHostAddress.Contains("]:"))
                     {
-                        ipAddressNumber = request.UserHostAddress.SplitOnLast(":")[0];
+                        ipAddressNumber = request.UserHostAddress.LastLeftPart(":");
                     }
                     else
                     {
                         ipAddressNumber = request.UserHostAddress.LastIndexOf("%", StringComparison.InvariantCulture) > 0 ?
-                            request.UserHostAddress.SplitOnLast(":")[0] :
+                            request.UserHostAddress.LastLeftPart(":") :
                             request.UserHostAddress;
                     }
                 }
 
                 try
                 {
-                    ipAddressNumber = ipAddressNumber.SplitOnFirst(',')[0];
+                    ipAddressNumber = ipAddressNumber.LeftPart(',');
                     var ipAddress = ipAddressNumber.StartsWith("::1")
                         ? IPAddress.IPv6Loopback
                         : IPAddress.Parse(ipAddressNumber);
diff --git a/src/ServiceStack/HttpResultUtils.cs b/src/ServiceStack/HttpResultUtils.cs
@@ -78,10 +78,10 @@ public static bool IsErrorResponse(this object response)
         /// </summary>
         public static void ExtractHttpRanges(this string rangeHeader, long contentLength, out long rangeStart, out long rangeEnd)
         {
-            var rangeParts = rangeHeader.SplitOnFirst("=")[1].SplitOnFirst("-");
-            rangeStart = Int64.Parse(rangeParts[0]);
-            rangeEnd = rangeParts.Length == 2 && !String.IsNullOrEmpty(rangeParts[1])
-                           ? Int32.Parse(rangeParts[1]) //the client requested a chunk
+            var rangeParts = rangeHeader.RightPart("=").SplitOnFirst("-");
+            rangeStart = long.Parse(rangeParts[0]);
+            rangeEnd = rangeParts.Length == 2 && !string.IsNullOrEmpty(rangeParts[1])
+                           ? int.Parse(rangeParts[1]) //the client requested a chunk
                            : contentLength - 1;
         }
 
diff --git a/src/ServiceStack/MiniProfiler/UI/MiniProfilerHandler.cs b/src/ServiceStack/MiniProfiler/UI/MiniProfilerHandler.cs
@@ -80,7 +80,7 @@ public static HtmlString RenderIncludes(Profiler profiler, RenderPosition? posit
         public static string GetFileNameWithoutExtension(string pathInfo)
         {
             //Path.GetFileNameWithoutExtension() throws exception with illegal chars
-            return pathInfo.SplitOnLast('.')[0].SplitOnLast('/').Last();
+            return pathInfo.LastLeftPart('.').LastRightPart('/');
         }
 
 		//internal static void RegisterRoutes()
diff --git a/src/ServiceStack/NativeTypes/CSharp/CSharpGenerator.cs b/src/ServiceStack/NativeTypes/CSharp/CSharpGenerator.cs
@@ -479,10 +479,10 @@ public static string TypeAlias(string type, bool includeNested = false)
 
         public static string NameOnly(string type, bool includeNested = false)
         {
-            var name = type.SplitOnFirst('`')[0];
+            var name = type.LeftPart('`');
 
             if (!includeNested)
-                name = name.SplitOnLast('.').Last();
+                name = name.LastRightPart('.');
 
             return name.SafeToken();
         }
diff --git a/src/ServiceStack/NativeTypes/FSharp/FSharpGenerator.cs b/src/ServiceStack/NativeTypes/FSharp/FSharpGenerator.cs
@@ -364,7 +364,7 @@ public string TypeValue(string type, string value)
             if (value.StartsWith("typeof("))
             {
                 //Only emit type as Namespaces are merged
-                var typeNameOnly = value.Substring(7, value.Length - 8).SplitOnLast('.').Last();
+                var typeNameOnly = value.Substring(7, value.Length - 8).LastRightPart('.');
                 return "typeof<" + typeNameOnly + ">";
             }
 
@@ -414,7 +414,7 @@ private string TypeAlias(string type)
 
         public string NameOnly(string type)
         {
-            return type.SplitOnFirst('`')[0].SplitOnLast('.').Last().SafeToken();
+            return type.LeftPart('`').LastRightPart('.').SafeToken();
         }
 
         public void AppendComments(StringBuilderWrapper sb, string desc)
diff --git a/src/ServiceStack/NativeTypes/Java/JavaGenerator.cs b/src/ServiceStack/NativeTypes/Java/JavaGenerator.cs
@@ -154,7 +154,7 @@ public string GetCode(MetadataTypes metadata, IRequest request, INativeTypesMeta
 
             //TypeScript doesn't support reusing same type name with different generic airity
             var conflictPartialNames = AllTypes.Map(x => x.Name).Distinct()
-                .GroupBy(g => g.SplitOnFirst('`')[0])
+                .GroupBy(g => g.LeftPart('`'))
                 .Where(g => g.Count() > 1)
                 .Select(g => g.Key)
                 .ToList();
@@ -345,8 +345,8 @@ private string AppendType(ref StringBuilderWrapper sb, MetadataType type, string
 
                         if (implStr.StartsWith("IReturn<"))
                         {
-                            var parts = implStr.SplitOnFirst('<');
-                            var returnType = parts[1].Substring(0, parts[1].Length - 1);
+                            var types = implStr.RightPart('<');
+                            var returnType = types.Substring(0, types.Length - 1);
 
                             //Can't get .class from Generic Type definition
                             responseTypeExpression = returnType.Contains("<")
@@ -530,7 +530,7 @@ public string TypeValue(string type, string value)
             if (value.StartsWith("typeof("))
             {
                 //Only emit type as Namespaces are merged
-                var typeNameOnly = value.Substring(7, value.Length - 8).SplitOnLast('.').Last();
+                var typeNameOnly = value.Substring(7, value.Length - 8).LastRightPart('.');
                 return typeNameOnly + ".class";
             }
 
@@ -616,7 +616,7 @@ public string NameOnly(string type)
                 ? type.Replace('`','_')
                 : type.SplitOnFirst('`')[0];
 
-            return name.SplitOnLast('.').Last().SafeToken();
+            return name.LastRightPart('.').SafeToken();
         }
 
         public void AppendComments(StringBuilderWrapper sb, string desc)
@@ -759,7 +759,7 @@ public string ConvertFromCSharp(TextNode node)
             }
 
             var typeName = sb.ToString();
-            return typeName.SplitOnLast('.').Last(); //remove nested class
+            return typeName.LastRightPart('.'); //remove nested class
         }
     }
 
diff --git a/src/ServiceStack/NativeTypes/Kotlin/KotlinGenerator.cs b/src/ServiceStack/NativeTypes/Kotlin/KotlinGenerator.cs
@@ -150,7 +150,7 @@ public string GetCode(MetadataTypes metadata, IRequest request, INativeTypesMeta
 
             //TypeScript doesn't support reusing same type name with different generic airity
             var conflictPartialNames = AllTypes.Map(x => x.Name).Distinct()
-                .GroupBy(g => g.SplitOnFirst('`')[0])
+                .GroupBy(g => g.LeftPart('`'))
                 .Where(g => g.Count() > 1)
                 .Select(g => g.Key)
                 .ToList();
@@ -334,8 +334,8 @@ private string AppendType(ref StringBuilderWrapper sb, MetadataType type, string
 
                         if (implStr.StartsWith("IReturn<"))
                         {
-                            var parts = implStr.SplitOnFirst('<');
-                            var returnType = parts[1].Substring(0, parts[1].Length - 1);
+                            var types = implStr.RightPart('<');
+                            var returnType = types.Substring(0, types.Length - 1);
 
                             //Can't get .class from Generic Type definition
                             responseTypeExpression = returnType.Contains("<")
@@ -501,7 +501,7 @@ public string TypeValue(string type, string value)
             if (value.StartsWith("typeof("))
             {
                 //Only emit type as Namespaces are merged
-                var typeNameOnly = value.Substring(7, value.Length - 8).SplitOnLast('.').Last();
+                var typeNameOnly = value.Substring(7, value.Length - 8).LastRightPart('.');
                 return typeNameOnly + ".class";
             }
 
@@ -587,7 +587,7 @@ public string NameOnly(string type)
                 ? type.Replace('`','_')
                 : type.SplitOnFirst('`')[0];
 
-            return name.SplitOnLast('.').Last().SafeToken();
+            return name.LastRightPart('.').SafeToken();
         }
 
         public void AppendComments(StringBuilderWrapper sb, string desc)
@@ -730,7 +730,7 @@ public string ConvertFromCSharp(TextNode node)
             }
 
             var typeName = sb.ToString();
-            return typeName.SplitOnLast('.').Last(); //remove nested class
+            return typeName.LastRightPart('.'); //remove nested class
         }
     }
 
diff --git a/src/ServiceStack/NativeTypes/NativeTypesMetadata.cs b/src/ServiceStack/NativeTypes/NativeTypesMetadata.cs
@@ -812,7 +812,7 @@ public static string ToPrettyName(this Type type)
                 return type.Name;
             
             var genericTypeName = type.GetGenericTypeDefinition().Name;
-            genericTypeName = genericTypeName.SplitOnFirst('`')[0];
+            genericTypeName = genericTypeName.LeftPart('`');
             var genericArgs = string.Join(",",
                 type.GetGenericArguments()
                     .Select(ToPrettyName).ToArray());
diff --git a/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs b/src/ServiceStack/NativeTypes/Swift/SwiftGenerator.cs
diff --git a/src/ServiceStack/NativeTypes/TypeScript/TypeScriptGenerator.cs b/src/ServiceStack/NativeTypes/TypeScript/TypeScriptGenerator.cs
diff --git a/src/ServiceStack/NativeTypes/VbNet/VbNetGenerator.cs b/src/ServiceStack/NativeTypes/VbNet/VbNetGenerator.cs
diff --git a/src/ServiceStack/PostmanFeature.cs b/src/ServiceStack/PostmanFeature.cs
diff --git a/src/ServiceStack/Support/Markdown/Evaluator.cs b/src/ServiceStack/Support/Markdown/Evaluator.cs
diff --git a/src/ServiceStack/VirtualPath/AbstractVirtualFileBase.cs b/src/ServiceStack/VirtualPath/AbstractVirtualFileBase.cs
diff --git a/src/ServiceStack/VirtualPath/InMemoryVirtualPathProvider.cs b/src/ServiceStack/VirtualPath/InMemoryVirtualPathProvider.cs

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static bool IsBinary(this string contentType)`
`76`	`76`	`return true;`
`77`	`77`	`}`
`78`	`78`
`79`		`- var primaryType = realContentType.SplitOnFirst('/')[0];`
	`79`	`+ var primaryType = realContentType.LeftPart('/');`
`80`	`80`	`switch (primaryType)`
`81`	`81`	`{`
`82`	`82`	`case "image":`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public object PopulateFromMap(object instance, IDictionary<string, string> keyVa`
`130`	`130`	`if (propertySerializerEntry.PropertyType == typeof (bool))`
`131`	`131`	`{`
`132`	`132`	`//InputExtensions.cs#530 MVC Checkbox helper emits extra hidden input field, generating 2 values, first is the real value`
`133`		`- propertyTextValue = propertyTextValue.SplitOnFirst(',').First();`
	`133`	`+ propertyTextValue = propertyTextValue.LeftPart(',');`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`var value = propertySerializerEntry.PropertyParseStringFn(propertyTextValue);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public class SetBaseType : RazorCodeTransformerBase`
`93`	`93`	`private readonly string _typeName;`
`94`	`94`	`public SetBaseType(string typeName, bool? isGenericType = null)`
`95`	`95`	`{`
`96`		- _typeName = typeName.SplitOnLast("`")[0]; //get clean generic name without 'GenericType`1' n args suffix
	`96`	+ _typeName = typeName.LastLeftPart("`"); //get clean generic name without 'GenericType`1' n args suffix
`97`	`97`	this.isGenericType = isGenericType ?? typeName.Contains("`");
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected virtual RazorPage AddPage(RazorPage page, string pagePath = null)`
`209`	`209`	`//Views should be uniquely named and stored in any deep folder structure`
`210`	`210`	`if (pagePath.StartsWithIgnoreCase("views/") && !pagePath.EndsWithIgnoreCase(DefaultLayoutFile))`
`211`	`211`	`{`
`212`		`- var viewName = pagePath.SplitOnLast('.').First().SplitOnLast('/').Last();`
	`212`	`+ var viewName = pagePath.LastLeftPart('.').LastRightPart('/');`
`213`	`213`	`ViewNamesMap[viewName] = pagePath;`
`214`	`214`	`}`
`215`	`215`
`@@ -260,7 +260,7 @@ public virtual RazorPage GetLayoutPage(string layoutName, RazorPage page, IReque`
`260`	`260`	`string contextParentDir = contextRelativePath;`
`261`	`261`	`do`
`262`	`262`	`{`
`263`		`- contextParentDir = (contextParentDir ?? "").SplitOnLast('/').First();`
	`263`	`+ contextParentDir = (contextParentDir ?? "").LastLeftPart('/');`
`264`	`264`
`265`	`265`	`var path = CombinePaths(contextParentDir, layoutFile);`
`266`	`266`	`var layoutPage = GetPage(path);`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void Register(IAppHost appHost)`
`123`	`123`	`var loadedAssemblyNames = CompilerServices`
`124`	`124`	`.GetLoadedAssemblies()`
`125`	`125`	`.Where(x => !x.IsDynamic)`
`126`		`- .Map(x => x.FullName.SplitOnFirst(',')[0]);`
	`126`	`+ .Map(x => x.FullName.LeftPart(','));`
`127`	`127`
`128`	`128`	`foreach (var razorNamespace in appHost.Config.RazorNamespaces)`
`129`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ private static void AppendTypedQueries(SqlExpression<From> q, IQueryDb dto, Dict`
`727`	`727`	`{`
`728`	`728`	`foreach (var entry in PropertyGetters)`
`729`	`729`	`{`
`730`		`- var name = entry.Key.SplitOnFirst('#')[0];`
	`730`	`+ var name = entry.Key.LeftPart('#');`
`731`	`731`
`732`	`732`	`QueryDbFieldAttribute implicitQuery;`
`733`	`733`	`QueryFieldMap.TryGetValue(name, out implicitQuery);`
`@@ -824,7 +824,7 @@ private static void AppendUntypedQueries(SqlExpression<From> q, Dictionary<strin`
`824`	`824`	`{`
`825`	`825`	`foreach (var entry in dynamicParams)`
`826`	`826`	`{`
`827`		`- var name = entry.Key.SplitOnFirst('#')[0];`
	`827`	`+ var name = entry.Key.LeftPart('#');`
`828`	`828`
`829`	`829`	`var match = GetQueryMatch(q, name, options, aliases);`
`830`	`830`	`if (match == null)`
Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ private static void AppendTypedQueries(IDataQuery q, IQueryData dto, Dictionary<`
`1150`	`1150`	`{`
`1151`	`1151`	`foreach (var entry in RequestPropertyGetters)`
`1152`	`1152`	`{`
`1153`		`- var name = entry.Key.SplitOnFirst('#')[0];`
	`1153`	`+ var name = entry.Key.LeftPart('#');`
`1154`	`1154`
`1155`	`1155`	`QueryDataField attr;`
`1156`	`1156`	`if (QueryFieldMap.TryGetValue(name, out attr))`
`@@ -1210,7 +1210,7 @@ private static void AppendUntypedQueries(IDataQuery q, Dictionary<string, string`
`1210`	`1210`	`{`
`1211`	`1211`	`foreach (var entry in dynamicParams)`
`1212`	`1212`	`{`
`1213`		`- var name = entry.Key.SplitOnFirst('#')[0];`
	`1213`	`+ var name = entry.Key.LeftPart('#');`
`1214`	`1214`
`1215`	`1215`	`var match = GetQueryMatch(q, name, options, aliases);`
`1216`	`1216`	`if (match == null)`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ protected string GetAction(Message requestMsg, string xml)`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`return xml.StartsWith("<")`
`332`		`- ? xml.Substring(1, xml.IndexOf(" ") - 1).SplitOnFirst(':').Last()`
	`332`	`+ ? xml.Substring(1, xml.IndexOf(" ") - 1).RightPart(':')`
`333`	`333`	`: null;`
`334`	`334`	`}`
`335`	`335`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ private static void AddReferencedTypes(MetadataType metadataType, MetadataTypes`
`451`	`451`	`}`
`452`	`452`	`else if (p.IsArray())`
`453`	`453`	`{`
`454`		`- var elType = p.Type.SplitOnFirst('[')[0];`
	`454`	`+ var elType = p.Type.LeftPart('[');`
`455`	`455`	`type = FindMetadataType(metadataTypes, elType);`
`456`	`456`	`if (type != null && !types.Contains(type))`
`457`	`457`	`{`