Tweak IndexOfAny

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -473,14 +473,17 @@ public static int IndexOfAny(this string text, params string[] needles)
 
         public static int IndexOfAny(this string text, int startIndex, params string[] needles)
         {
-            if (text == null) return -1;
-
             var firstPos = -1;
-            foreach (var needle in needles)
+            if (text != null)
             {
-                var pos = text.IndexOf(needle);
-                if (firstPos == -1 || pos < firstPos) firstPos = pos;
+                foreach (var needle in needles)
+                {
+                    var pos = text.IndexOf(needle, startIndex);
+                    if (firstPos == -1 || pos < firstPos)
+                        firstPos = pos;
+                }
             }
+
             return firstPos;
         }
 

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -86,7 +86,6 @@ public void Does_find_IndexOfAny_strings()
 		{
 			var text = "text with /* and <!--";
 			var pos = text.IndexOfAny("<!--", "/*");
-			//Console.WriteLine(text.Substring(pos));
 			Assert.That(pos, Is.EqualTo("text with ".Length));
 		}