[elpa] master 5cb52a7 11/38: Merge pull request #454 from olessavluk/trailing-comma

[Dmitry Gutov]

branch: master
commit 5cb52a7de8218bb2d50f67ba422fa7b2d51d1dc6
Merge: df51992 daed014
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #454 from olessavluk/trailing-comma
    
    Add support for trailing comma in function arguments
---
 NEWS.md         | 4 ++++
 js2-mode.el     | 4 +++-
 tests/parser.el | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 51ff733..dcba655 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,9 @@
 # History of user-visible changes
 
+## Next
+
+* Support for trailing comma in function arguments
+
 ## 2017-07-21
 
 * Support for async arrow function without parentheses.
diff --git a/js2-mode.el b/js2-mode.el
index 3ce65de..fd1655a 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -10238,7 +10238,9 @@ Returns the list in reverse order.  Consumes the 
right-paren token."
                    (js2-unget-token)
                    (push (js2-parse-assign-expr) result)))
                while
-               (js2-match-token js2-COMMA))
+               (and (js2-match-token js2-COMMA)
+                    (or (< js2-language-version 200)
+                        (not (= js2-RP (js2-peek-token))))))
       (js2-must-match js2-RP "msg.no.paren.arg")
       result)))
 
diff --git a/tests/parser.el b/tests/parser.el
index ccacd01..173bbe9 100644
--- a/tests/parser.el
+++ b/tests/parser.el
@@ -106,6 +106,10 @@ the test."
 (js2-deftest-parse function-statement
   "function foo() {\n}")
 
+(js2-deftest-parse trailing-comma-in-function-arguments
+   "f(a, b,);"
+   :reference "f(a, b);")
+
 (js2-deftest-parse function-statement-inside-block
   "if (true) {\n  function foo() {\n  }\n}")