handle count equals 1 and RemoveEmptyEntries set

Author: Guiorgy

src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs

@@ -43,6 +43,11 @@ public SpanSplitStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> source,
             CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
             EnumerationDone = count == 0;
             Current = default;
+
+            if(count == 1) // special case
+            {
+                CurrentCount = 0;
+            }
         }
 
         /// <summary>
@@ -68,11 +73,11 @@ public bool MoveNext()
             {
                 int delimiterIndex = Span.IndexOf(Delimiter);
 
-                if(delimiterIndex == -1 || CurrentCount == 1)
+                if(delimiterIndex == -1 || CurrentCount <= 1)
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
+                    if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {

src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs

@@ -43,6 +43,11 @@ public SpanSplitAnyStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char> sour
             CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
             EnumerationDone = count == 0;
             Current = default;
+
+            if(count == 1) // special case
+            {
+                CurrentCount = 0;
+            }
         }
 
         /// <summary>
@@ -68,11 +73,11 @@ public bool MoveNext()
             {
                 int delimiterIndex = Span.IndexOfAny(Delimiters);
 
-                if(delimiterIndex == -1 || CurrentCount == 1)
+                if(delimiterIndex == -1 || CurrentCount <= 1)
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
+                    if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {

src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs

@@ -44,6 +44,11 @@ public SpanSplitSequenceStringSplitOptionsWithCountEnumerator(ReadOnlySpan<char>
             CountExceedingBehaviour = countExceedingBehaviour.ThrowIfInvalid();
             EnumerationDone = count == 0;
             Current = default;
+
+            if(count == 1) // special case
+            {
+                CurrentCount = 0;
+            }
         }
 
         /// <summary>
@@ -69,11 +74,11 @@ public bool MoveNext()
             {
                 int delimiterIndex = Span.IndexOf(Delimiter);
 
-                if(delimiterIndex == -1 || CurrentCount == 1)
+                if(delimiterIndex == -1 || CurrentCount <= 1)
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
+                    if(CurrentCount != 0 && delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {