RemoveEmptyEntries on CutLastElements too

Guiorgy · Guiorgy · commit c41ff07fb672 · 2024-02-05T13:14:30.000+04:00
diff --git a/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/Split/SpanSplitStringSplitOptionsWithCountEnumerator.cs
@@ -72,7 +72,7 @@ public bool MoveNext()
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries && CountExceedingBehaviour == CountExceedingBehaviour.AppendLastElements) // skip all empty (after trimming if necessary) entries from the left
+                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {
@@ -86,6 +86,10 @@ public bool MoveNext()
                                 continue;
                             }
 
+                            if(CountExceedingBehaviour == CountExceedingBehaviour.CutLastElements)
+                            {
+                                Span = beforeDelimiter;
+                            }
                             break;
                         }
                         while(delimiterIndex != -1);
diff --git a/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitAny/SpanSplitAnyStringSplitOptionsWithCountEnumerator.cs
@@ -72,7 +72,7 @@ public bool MoveNext()
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries && CountExceedingBehaviour == CountExceedingBehaviour.AppendLastElements) // skip all empty (after trimming if necessary) entries from the left
+                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {
@@ -86,6 +86,10 @@ public bool MoveNext()
                                 continue;
                             }
 
+                            if(CountExceedingBehaviour == CountExceedingBehaviour.CutLastElements)
+                            {
+                                Span = beforeDelimiter;
+                            }
                             break;
                         }
                         while(delimiterIndex != -1);
diff --git a/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs b/src/Enumerators/SplitSequence/SpanSplitSequenceStringSplitOptionsWithCountEnumerator.cs
@@ -73,7 +73,7 @@ public bool MoveNext()
                 {
                     EnumerationDone = true;
 
-                    if(delimiterIndex != -1 && RemoveEmptyEntries && CountExceedingBehaviour == CountExceedingBehaviour.AppendLastElements) // skip all empty (after trimming if necessary) entries from the left
+                    if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left
                     {
                         do
                         {
@@ -87,6 +87,10 @@ public bool MoveNext()
                                 continue;
                             }
 
+                            if(CountExceedingBehaviour == CountExceedingBehaviour.CutLastElements)
+                            {
+                                Span = beforeDelimiter;
+                            }
                             break;
                         }
                         while(delimiterIndex != -1);

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public bool MoveNext()`
`72`	`72`	`{`
`73`	`73`	`EnumerationDone = true;`
`74`	`74`
`75`		`- if(delimiterIndex != -1 && RemoveEmptyEntries && CountExceedingBehaviour == CountExceedingBehaviour.AppendLastElements) // skip all empty (after trimming if necessary) entries from the left`
	`75`	`+ if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left`
`76`	`76`	`{`
`77`	`77`	`do`
`78`	`78`	`{`
`@@ -86,6 +86,10 @@ public bool MoveNext()`
`86`	`86`	`continue;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ if(CountExceedingBehaviour == CountExceedingBehaviour.CutLastElements)`
	`90`	`+ {`
	`91`	`+ Span = beforeDelimiter;`
	`92`	`+ }`
`89`	`93`	`break;`
`90`	`94`	`}`
`91`	`95`	`while(delimiterIndex != -1);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public bool MoveNext()`
`73`	`73`	`{`
`74`	`74`	`EnumerationDone = true;`
`75`	`75`
`76`		`- if(delimiterIndex != -1 && RemoveEmptyEntries && CountExceedingBehaviour == CountExceedingBehaviour.AppendLastElements) // skip all empty (after trimming if necessary) entries from the left`
	`76`	`+ if(delimiterIndex != -1 && RemoveEmptyEntries) // skip all empty (after trimming if necessary) entries from the left`
`77`	`77`	`{`
`78`	`78`	`do`
`79`	`79`	`{`
`@@ -87,6 +87,10 @@ public bool MoveNext()`
`87`	`87`	`continue;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ if(CountExceedingBehaviour == CountExceedingBehaviour.CutLastElements)`
	`91`	`+ {`
	`92`	`+ Span = beforeDelimiter;`
	`93`	`+ }`
`90`	`94`	`break;`
`91`	`95`	`}`
`92`	`96`	`while(delimiterIndex != -1);`