Fix handling empty part

burningtnt · Dec 8, 2023 · 2dff954 · 2dff954
1 parent 1c4ed0d
commit 2dff954
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
@@ -213,6 +213,7 @@ public static List<String> tokenize(String str) {
             // Split the string with ' and space cleverly.
             ArrayList<String> parts = new ArrayList<>();
 
+            boolean hasValue = false;
             StringBuilder current = new StringBuilder(str.length());
             for (int i = 0; i < str.length(); ) {
                 char c = str.charAt(i);
@@ -223,18 +224,21 @@ public static List<String> tokenize(String str) {
                     }
                     current.append(str, i + 1, end);
                     i = end + 1;
+                    hasValue = true;
                 } else if (c == ' ') {
-                    if (current.length() > 0) {
+                    if (hasValue) {
                         parts.add(current.toString());
                         current.setLength(0);
+                        hasValue = false;
                     }
                     i++;
                 } else {
                     current.append(c);
+                    hasValue = true;
                     i++;
                 }
             }
-            if (current.length() > 0) {
+            if (hasValue) {
                 parts.add(current.toString());
             }
 

diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TokenizerTest.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/TokenizerTest.java
@@ -28,5 +28,9 @@ public void textTokenizer() {
                 "Text  with  multiple  spaces",
                 "Text", "with", "multiple", "spaces"
         );
+        test(
+                "Text with empty ''",
+                "Text", "with", "empty", ""
+        );
     }
 }