branch: externals/js2-mode commit c665ebef6c440312449d82e95bb810bf213417a1 Author: Dmitry Gutov <dgu...@yandex.ru> Commit: Dmitry Gutov <dgu...@yandex.ru>
Move '??' back between '?:' and '||' --- js2-mode.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js2-mode.el b/js2-mode.el index 3c043b8..341f01b 100644 --- a/js2-mode.el +++ b/js2-mode.el @@ -9938,7 +9938,7 @@ If NODE is non-nil, it is the AST node associated with the symbol." (defun js2-parse-cond-expr () (let ((pos (js2-current-token-beg)) - (pn (js2-parse-or-expr)) + (pn (js2-parse-nullish-coalescing-expr)) test-expr if-true if-false @@ -10016,7 +10016,7 @@ FIXME: The latter option is unused?" pn)) (defun js2-parse-bit-and-expr () - (let ((pn (js2-parse-nullish-coalescing-expr))) + (let ((pn (js2-parse-eq-expr))) (while (js2-match-token js2-BITAND) (setq pn (js2-make-binary js2-BITAND pn @@ -10025,7 +10025,7 @@ FIXME: The latter option is unused?" (defun js2-parse-nullish-coalescing-expr () - (let ((pn (js2-parse-eq-expr))) + (let ((pn (js2-parse-or-expr))) (when (js2-match-token js2-NULLISH-COALESCING) (setq pn (js2-make-binary js2-NULLISH-COALESCING pn