Change behavior of Left/Right Part to match SplitOnFirst()[0] and SplitOnLast().Last() behavior

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -358,7 +358,7 @@ public static string RightPart(this string strVal, char needle)
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle);
             return pos == -1
-                ? null
+                ? strVal
                 : strVal.Substring(pos + 1);
         }
 
@@ -367,7 +367,7 @@ public static string RightPart(this string strVal, string needle)
             if (strVal == null) return null;
             var pos = strVal.IndexOf(needle, StringComparison.OrdinalIgnoreCase);
             return pos == -1
-                ? null
+                ? strVal
                 : strVal.Substring(pos + needle.Length);
         }
 
@@ -394,7 +394,7 @@ public static string LastRightPart(this string strVal, char needle)
             if (strVal == null) return null;
             var pos = strVal.LastIndexOf(needle);
             return pos == -1
-                ? null
+                ? strVal
                 : strVal.Substring(pos + 1);
         }
 
@@ -403,7 +403,7 @@ 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
                 : strVal.Substring(pos + needle.Length);
         }
 

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -21,10 +21,14 @@ public void Can_LeftPart_and_LeftPart_char_needle()
         {
             var str = "user:pass@w:rd";
             Assert.That(str.LeftPart(':'), Is.EqualTo("user"));
+            Assert.That(str.SplitOnFirst(':')[0], Is.EqualTo("user"));
             Assert.That(str.RightPart(':'), Is.EqualTo("pass@w:rd"));
+            Assert.That(str.SplitOnFirst(':').Last(), Is.EqualTo("pass@w:rd"));
 
             Assert.That(str.LeftPart('|'), Is.EqualTo("user:pass@w:rd"));
-            Assert.That(str.RightPart('|'), Is.Null);
+            Assert.That(str.SplitOnFirst('|')[0], Is.EqualTo("user:pass@w:rd"));
+            Assert.That(str.RightPart('|'), Is.EqualTo("user:pass@w:rd"));
+            Assert.That(str.SplitOnFirst('|').Last(), Is.EqualTo("user:pass@w:rd"));
         }
 
         [Test]
@@ -40,10 +44,14 @@ public void Can_LeftPart_and_RightPart_string_needle()
         {
             var str = "user::pass@w:rd";
             Assert.That(str.LeftPart("::"), Is.EqualTo("user"));
+            Assert.That(str.SplitOnFirst("::")[0], Is.EqualTo("user"));
             Assert.That(str.RightPart("::"), Is.EqualTo("pass@w:rd"));
+            Assert.That(str.SplitOnFirst("::").Last(), Is.EqualTo("pass@w:rd"));
 
             Assert.That(str.LeftPart("||"), Is.EqualTo("user::pass@w:rd"));
-            Assert.That(str.RightPart("||"), Is.Null);
+            Assert.That(str.SplitOnFirst("||")[0], Is.EqualTo("user::pass@w:rd"));
+            Assert.That(str.RightPart("||"), Is.EqualTo("user::pass@w:rd"));
+            Assert.That(str.SplitOnFirst("||").Last(), Is.EqualTo("user::pass@w:rd"));
         }
 
         [Test]
@@ -59,10 +67,14 @@ 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.SplitOnLast(':')[0], Is.EqualTo("user:name"));
             Assert.That(str.LastRightPart(':'), Is.EqualTo("pass@word"));
+            Assert.That(str.SplitOnLast(':').Last(), Is.EqualTo("pass@word"));
 
             Assert.That(str.LastLeftPart('|'), Is.EqualTo("user:name:pass@word"));
-            Assert.That(str.LastRightPart('|'), Is.Null);
+            Assert.That(str.SplitOnLast('|')[0], Is.EqualTo("user:name:pass@word"));
+            Assert.That(str.LastRightPart('|'), Is.EqualTo("user:name:pass@word"));
+            Assert.That(str.SplitOnLast('|').Last(), Is.EqualTo("user:name:pass@word"));
         }
 
         [Test]
@@ -78,10 +90,14 @@ 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.SplitOnLast("::")[0], Is.EqualTo("user::name"));
             Assert.That(str.LastRightPart("::"), Is.EqualTo("pass@word"));
+            Assert.That(str.SplitOnLast("::").Last(), Is.EqualTo("pass@word"));
 
             Assert.That(str.LastLeftPart("||"), Is.EqualTo("user::name::pass@word"));
-            Assert.That(str.LastRightPart("||"), Is.Null);
+            Assert.That(str.SplitOnLast("||")[0], Is.EqualTo("user::name::pass@word"));
+            Assert.That(str.LastRightPart("||"), Is.EqualTo("user::name::pass@word"));
+            Assert.That(str.SplitOnLast("||").Last(), Is.EqualTo("user::name::pass@word"));
         }
 
         private static readonly char DirSep = Path.DirectorySeparatorChar;