Support for nullish coalescing

beautifier · Aug 12, 2020 · ba04879 · ba04879
1 parent a4d6cb9
commit ba04879
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/js/src/javascript/tokenizer.js b/js/src/javascript/tokenizer.js
@@ -75,15 +75,15 @@ var dot_pattern = /[^\d\.]/;
 
 var positionable_operators = (
   ">>> === !== " +
-  "<< && >= ** != == <= >> || |> " +
+  "<< && >= ** != == <= >> || ?? |> " +
   "< / - + > : & % ? ^ | *").split(' ');
 
 // IMPORTANT: this must be sorted longest to shortest or tokenizing many not work.
 // Also, you must update possitionable operators separately from punct
 var punct =
   ">>>= " +
   "... >>= <<= === >>> !== **= " +
-  "=> ^= :: /= << <= == && -= >= >> != -- += ** || ++ %= &= *= |= |> " +
+  "=> ^= :: /= << <= == && -= >= >> != -- += ** || ?? ++ %= &= *= |= |> " +
   "= ! ? > < : / ^ - + * & % ~ |";
 
 punct = punct.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");

diff --git a/js/test/generated/beautify-javascript-tests.js b/js/test/generated/beautify-javascript-tests.js
@@ -7001,6 +7001,9 @@ function run_javascript_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '        return x;\n' +
             '    };');
 
+        // Issue #1794 - support nullish-coalescing
+        bt('a = b ?? c');
+
         // Issue #569 - function should not have blank line in a number of cases
         bt(
             '(function(global) {\n' +

diff --git a/python/jsbeautifier/javascript/tokenizer.py b/python/jsbeautifier/javascript/tokenizer.py
@@ -69,14 +69,14 @@ def __init__(self):
 
 positionable_operators = frozenset(
     (
-        ">>> === !== " + "<< && >= ** != == <= >> || |> " + "< / - + > : & % ? ^ | *"
+        ">>> === !== " + "<< && >= ** != == <= >> || ?? |> " + "< / - + > : & % ? ^ | *"
     ).split(" ")
 )
 
 punct = (
     ">>>= "
     + "... >>= <<= === >>> !== **= "
-    + "=> ^= :: /= << <= == && -= >= >> != -- += ** || ++ %= &= *= |= |> "
+    + "=> ^= :: /= << <= == && -= >= >> != -- += ** || ?? ++ %= &= *= |= |> "
     + "= ! ? > < : / ^ - + * & % ~ |"
 )
 

diff --git a/python/jsbeautifier/tests/generated/tests.py b/python/jsbeautifier/tests/generated/tests.py
@@ -6712,6 +6712,9 @@ def unicode_char(value):
             '        return x;\n' +
             '    };')
 
+        # Issue #1794 - support nullish-coalescing
+        bt('a = b ?? c')
+
         # Issue #569 - function should not have blank line in a number of cases
         bt(
             '(function(global) {\n' +

diff --git a/test/data/javascript/tests.js b/test/data/javascript/tests.js
@@ -3805,6 +3805,12 @@ exports.test_data = {
             '    };'
           ]
         },
+        {
+          comment: 'Issue #1794 - support nullish-coalescing',
+          unchanged: [
+            'a = b ?? c'
+          ]
+        },
         {
           comment: "Issue #569 - function should not have blank line in a number of cases",
           unchanged: [