Add LastLeftPart/LastRightPart and rename GetLeft/RightPart

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -335,7 +335,7 @@ private static byte[] FastToUtf8Bytes(string strVal)
             return bytes;
         }
 
-        public static string GetLeftPart(this string strVal, char needle)
+        public static string LeftPart(this string strVal, char needle)
         {
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle);
@@ -344,7 +344,7 @@ public static string GetLeftPart(this string strVal, char needle)
                 : strVal.Substring(0, pos);
         }
 
-        public static string GetLeftPart(this string strVal, string needle)
+        public static string LeftPart(this string strVal, string needle)
         {
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle, StringComparison.OrdinalIgnoreCase);
@@ -353,7 +353,7 @@ public static string GetLeftPart(this string strVal, string needle)
                 : strVal.Substring(0, pos);
         }
 
-        public static string GetRightPart(this string strVal, char needle)
+        public static string RightPart(this string strVal, char needle)
         {
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle);
@@ -362,7 +362,7 @@ public static string GetRightPart(this string strVal, char needle)
                 : strVal.Substring(pos + 1);
         }
 
-        public static string GetRightPart(this string strVal, string needle)
+        public static string RightPart(this string strVal, string needle)
         {
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle, StringComparison.OrdinalIgnoreCase);
@@ -371,6 +371,42 @@ public static string GetRightPart(this string strVal, string needle)
                 : strVal.Substring(pos + needle.Length);
         }
 
+        public static string LastLeftPart(this string strVal, char needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.LastIndexOf(needle);
+            return pos == -1
+                ? strVal
+                : strVal.Substring(0, pos);
+        }
+
+        public static string LastLeftPart(this string strVal, string needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.LastIndexOf(needle, StringComparison.OrdinalIgnoreCase);
+            return pos == -1
+                ? strVal
+                : strVal.Substring(0, pos);
+        }
+
+        public static string LastRightPart(this string strVal, char needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.LastIndexOf(needle);
+            return pos == -1
+                ? null
+                : strVal.Substring(pos + 1);
+        }
+
+        public static string LastRightPart(this string strVal, string needle)
+        {
+            if (strVal == null) return null;
+            var pos = strVal.LastIndexOf(needle, StringComparison.OrdinalIgnoreCase);
+            return pos == -1
+                ? null
+                : strVal.Substring(pos + needle.Length);
+        }
+
         public static string[] SplitOnFirst(this string strVal, char needle)
         {
             if (strVal == null) return TypeConstants.EmptyStringArray;

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -17,14 +17,14 @@ public void Can_SplitOnFirst_char_needle()
         }
 
         [Test]
-        public void Can_GetLeftPart_and_GetLeftPart_char_needle()
+        public void Can_LeftPart_and_LeftPart_char_needle()
         {
             var str = "user:pass@w:rd";
-            Assert.That(str.GetLeftPart(':'), Is.EqualTo("user"));
-            Assert.That(str.GetRightPart(':'), Is.EqualTo("pass@w:rd"));
+            Assert.That(str.LeftPart(':'), Is.EqualTo("user"));
+            Assert.That(str.RightPart(':'), Is.EqualTo("pass@w:rd"));
 
-            Assert.That(str.GetLeftPart('|'), Is.EqualTo("user:pass@w:rd"));
-            Assert.That(str.GetRightPart('|'), Is.Null);
+            Assert.That(str.LeftPart('|'), Is.EqualTo("user:pass@w:rd"));
+            Assert.That(str.RightPart('|'), Is.Null);
         }
 
         [Test]
@@ -36,14 +36,14 @@ public void Can_SplitOnFirst_string_needle()
         }
 
         [Test]
-        public void Can_GetLeftPart_and_GetLeftPart_string_needle()
+        public void Can_LeftPart_and_RightPart_string_needle()
         {
             var str = "user::pass@w:rd";
-            Assert.That(str.GetLeftPart("::"), Is.EqualTo("user"));
-            Assert.That(str.GetRightPart("::"), Is.EqualTo("pass@w:rd"));
+            Assert.That(str.LeftPart("::"), Is.EqualTo("user"));
+            Assert.That(str.RightPart("::"), Is.EqualTo("pass@w:rd"));
 
-            Assert.That(str.GetLeftPart("||"), Is.EqualTo("user::pass@w:rd"));
-            Assert.That(str.GetRightPart("||"), Is.Null);
+            Assert.That(str.LeftPart("||"), Is.EqualTo("user::pass@w:rd"));
+            Assert.That(str.RightPart("||"), Is.Null);
         }
 
         [Test]
@@ -54,6 +54,17 @@ public void Can_SplitOnLast_char_needle()
             Assert.That(parts[1], Is.EqualTo("pass@word"));
         }
 
+        [Test]
+        public void Can_LastLeftPart_and_LastRightPart_char_needle()
+        {
+            var str = "user:name:pass@word";
+            Assert.That(str.LastLeftPart(':'), Is.EqualTo("user:name"));
+            Assert.That(str.LastRightPart(':'), Is.EqualTo("pass@word"));
+
+            Assert.That(str.LastLeftPart('|'), Is.EqualTo("user:name:pass@word"));
+            Assert.That(str.LastRightPart('|'), Is.Null);
+        }
+
         [Test]
         public void Can_SplitOnLast_string_needle()
         {
@@ -62,6 +73,17 @@ public void Can_SplitOnLast_string_needle()
             Assert.That(parts[1], Is.EqualTo("pass@word"));
         }
 
+        [Test]
+        public void Can_LastLeftPart_and_LastRightPart_string_needle()
+        {
+            var str = "user::name::pass@word";
+            Assert.That(str.LastLeftPart("::"), Is.EqualTo("user::name"));
+            Assert.That(str.LastRightPart("::"), Is.EqualTo("pass@word"));
+
+            Assert.That(str.LastLeftPart("||"), Is.EqualTo("user::name::pass@word"));
+            Assert.That(str.LastRightPart("||"), Is.Null);
+        }
+
         private static readonly char DirSep = Path.DirectorySeparatorChar;
         private static readonly char AltDirSep = Path.DirectorySeparatorChar == '/' ? '\\' : '/';