[elpa] master 13f0ffb 042/110: Fix parsing of param with destructure and default

[Dmitry Gutov]

branch: master
commit 13f0ffb38ae9d2d0903b251c4452b8dae7be0b6f
Author: David Greenspan <address@hidden>
Commit: David Greenspan <address@hidden>

    Fix parsing of param with destructure and default
    
    `function foo(bar, {a = {}} = {}) {/**/}`
---
 js2-mode.el     |   36 ++++++++++++++++++------------------
 tests/parser.el |    5 ++++-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 43c47cc..ee07edb 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -8088,8 +8088,7 @@ represented by FN-NODE at POS."
                        new-param-name-nodes (js2-define-destruct-symbols
                                              param js2-LP 'js2-function-param))
                  (js2-check-strict-function-params param-name-nodes 
new-param-name-nodes)
-                 (setq param-name-nodes (append param-name-nodes 
new-param-name-nodes))
-                 (push param params))
+                 (setq param-name-nodes (append param-name-nodes 
new-param-name-nodes)))
                 ;; variable name
                 (t
                  (when (and (>= js2-language-version 200)
@@ -8103,22 +8102,23 @@ represented by FN-NODE at POS."
                  (setq param (js2-create-name-node))
                  (js2-define-symbol js2-LP (js2-current-token-string) param)
                  (js2-check-strict-function-params param-name-nodes (list 
param))
-                 (setq param-name-nodes (append param-name-nodes (list param)))
-                 ;; default parameter value
-                 (when (and (>= js2-language-version 200)
-                            (js2-match-token js2-ASSIGN))
-                   (cl-assert (not paren-free-arrow))
-                   (let* ((pos (js2-node-pos param))
-                          (tt (js2-current-token-type))
-                          (op-pos (- (js2-current-token-beg) pos))
-                          (left param)
-                          (right (js2-parse-assign-expr))
-                          (len (- (js2-node-end right) pos)))
-                     (setq param (make-js2-assign-node
-                                  :type tt :pos pos :len len :op-pos op-pos
-                                  :left left :right right))
-                     (js2-node-add-children param left right)))
-                 (push param params)))
+                 (setq param-name-nodes (append param-name-nodes (list 
param)))))
+               ;; default parameter value
+               (when (and (not rest-param-at)
+                          (>= js2-language-version 200)
+                          (js2-match-token js2-ASSIGN))
+                 (cl-assert (not paren-free-arrow))
+                 (let* ((pos (js2-node-pos param))
+                        (tt (js2-current-token-type))
+                        (op-pos (- (js2-current-token-beg) pos))
+                        (left param)
+                        (right (js2-parse-assign-expr))
+                        (len (- (js2-node-end right) pos)))
+                   (setq param (make-js2-assign-node
+                                :type tt :pos pos :len len :op-pos op-pos
+                                :left left :right right))
+                   (js2-node-add-children param left right)))
+               (push param params)
                (when (and rest-param-at (> (length params) (1+ rest-param-at)))
                  (js2-report-error "msg.param.after.rest" nil
                                    (js2-node-pos param) (js2-node-len param)))
diff --git a/tests/parser.el b/tests/parser.el
index 9f8ab81..e97000d 100644
--- a/tests/parser.el
+++ b/tests/parser.el
@@ -187,9 +187,12 @@ the test."
 (js2-deftest-parse destruct-non-name-target-is-error
   "var {1=1} = {};" :syntax-error "1" :errors-count 1)
 
-(js2-deftest-parse destruct-with-initializer-in-function-arguments
+(js2-deftest-parse destruct-with-initializer-in-function-params
   "function f({a, b = 1, c}, [d, e = 1, f]) {\n}")
 
+(js2-deftest-parse destruct-with-default-in-function-params
+  "function f({x = 1, y = 2} = {}, [x, y] = [1, 2]) {\n}")
+
 (js2-deftest-parse destruct-name-conflict-is-error-in-object
   "\"use strict\";\nvar {a=1,a=2} = {};" :syntax-error "a" :errors-count 1)