From b7299de07943e7bc4fbc53c8dcbea5a3a07fba5d Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 8 Sep 2014 23:42:33 +0400 Subject: [PATCH] js2-parse-let: Simplify --- js2-mode.el | 3 +-- tests/parser.el | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js2-mode.el b/js2-mode.el index ec261e77b..81060d10e 100644 --- a/js2-mode.el +++ b/js2-mode.el @@ -8462,7 +8462,7 @@ by `js2-parse-variables'." (setq vars (js2-parse-variables js2-LET (js2-current-token-beg))) (if (js2-must-match js2-RP "msg.no.paren.let") (setf (js2-let-node-rp pn) (- (js2-current-token-beg) pos))) - (if (and stmt-p (eq (js2-get-token) js2-LC)) + (if (and stmt-p (js2-match-token js2-LC)) ;; let statement (progn (setf beg (js2-current-token-beg) ; position stmt at LC @@ -8473,7 +8473,6 @@ by `js2-parse-variables'." (js2-let-node-body pn) body (js2-node-type pn) js2-LET)) ;; let expression - (when stmt-p (js2-unget-token)) (setf body (js2-parse-expr) (js2-node-len pn) (- (js2-node-end body) pos) (js2-let-node-body pn) body)) diff --git a/tests/parser.el b/tests/parser.el index 37d9afac3..1df960366 100644 --- a/tests/parser.el +++ b/tests/parser.el @@ -124,6 +124,9 @@ the test." (js2-deftest-parse let-expression "(let (x = 42) x);") +(js2-deftest-parse let-expression-statement + "let (x = 42) x;") + ;;; Callers of `js2-valid-prop-name-token' (js2-deftest-parse parse-property-access-when-not-keyword -- 2.39.2