fix(stringx) do not append empty string if hit number of matches

lunarmodules · Apr 28, 2019 · 66e8599 · 66e8599
1 parent f9f06de
commit 66e8599
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,8 @@
   - `types.is_empty` would return true on spaces always, indepedent of the parameter
   - `types.to_bool` will now compare case-insensitive for the extra passed strings
   - `app.require_here` will now properly handle an absolute base path
+  - `stringx.split` will no longer append an empty match if the number of requested
+    elements has already been reached.
 
 ## 1.6.0 (2018-11-23)
 

diff --git a/lua/pl/stringx.lua b/lua/pl/stringx.lua
@@ -190,7 +190,9 @@ function stringx.split(s,re,n)
         plain = false
     end
     local res = usplit(s,re,plain,n)
-    if re and re ~= '' and find(s,re,-#re,true) then
+    if re and re ~= '' and
+       find(s,re,-#re,true) and
+       (n or math.huge) > #res then
         res[#res+1] = ""
     end
     return makelist(res)

diff --git a/tests/test-stringx.lua b/tests/test-stringx.lua
@@ -150,6 +150,7 @@ asserteq(split('a', 'a'), {''})
 asserteq(split(' 1  2  3 '),{'1','2','3'})
 asserteq(split('a*bb*c*ddd','*'),{'a','bb','c','ddd'})
 asserteq(split('dog:fred:bonzo:alice',':',3), {'dog','fred','bonzo:alice'})
+asserteq(split('dog:fred:bonzo:alice:',':',3), {'dog','fred','bonzo:alice:'})
 asserteq(split('///','/'),{'','','',''})
 -- capitalize
 asserteq(T(stringx.capitalize('')), T(''))