Fix an error in comma resolution

borgar · Oct 2, 2024 · 3dc39f8 · 3dc39f8
1 parent df3720d
commit 3dc39f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/tokenize.js b/lib/tokenize.js
@@ -151,6 +151,10 @@ export function tokenize (pattern) {
           break;
         }
       }
+      // if we just matched a break, then deal with any unresolved commas
+      if (unresolvedCommas.length && token.raw === ';') {
+        unresolvedCommas.length = 0;
+      }
       // if we just matched a num operator, then deal with any unresolved commas
       if (unresolvedCommas.length && isNumOp(token.raw)) {
         unresolvedCommas.forEach(d => (d.type = TOKEN_GROUP));

diff --git a/test/numfmt-test.js b/test/numfmt-test.js
@@ -280,3 +280,10 @@ test('Tokenizer is not case sensitive:', t => {
   t.format('dDdD', 1234, 'Monday');
   t.end();
 });
+
+test('Comma resolution test:', t => {
+  t.format('#,,"M"', 6000000, '6M');
+  t.format('#,,"M";', 6000000, '6M');
+  t.format('#,,"M";#,,"M";0', 6000000, '6M');
+  t.end();
+});