[elpa] master df51992 09/38: Fix function/class declaration issues from commit 7e4293b

[Dmitry Gutov]

branch: master
commit df51992a648c7fb3e441106defdbffa2ef2f020d
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Fix function/class declaration issues from commit 7e4293b
    
    Parse default export functions and classes as statements of
    expressions depending on whether the name is present.
    
    Fixes #441.
---
 js2-mode.el     | 12 +++++++++---
 tests/parser.el |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 983c919..3ce65de 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -9045,14 +9045,20 @@ invalid export statements."
         (setq from-clause (js2-parse-from-clause))))
      ((js2-match-token js2-DEFAULT)
       (setq default (cond ((js2-match-token js2-CLASS)
-                           (js2-parse-class-expr))
+                           (if (eq (js2-peek-token) js2-NAME)
+                               (js2-parse-class-stmt)
+                             (js2-parse-class-expr)))
                           ((js2-match-token js2-NAME)
                            (if (js2-match-async-function)
-                               (js2-parse-function-expr t)
+                               (if (eq (js2-peek-token) js2-NAME)
+                                   (js2-parse-async-function-stmt)
+                                 (js2-parse-function-expr t))
                              (js2-unget-token)
                              (js2-parse-expr)))
                           ((js2-match-token js2-FUNCTION)
-                           (js2-parse-function-expr))
+                           (if (eq (js2-peek-token) js2-NAME)
+                               (js2-parse-function-stmt)
+                             (js2-parse-function-expr)))
                           (t (js2-parse-expr)))))
      ((or (js2-match-token js2-VAR) (js2-match-token js2-CONST) 
(js2-match-token js2-LET))
       (setq declaration (js2-parse-variables (js2-current-token-type) 
(js2-current-token-beg))))
diff --git a/tests/parser.el b/tests/parser.el
index 25bda07..ccacd01 100644
--- a/tests/parser.el
+++ b/tests/parser.el
@@ -884,7 +884,7 @@ the test."
   "export async function f() {\n  await f();\n}")
 
 (js2-deftest-parse parse-export-default-async-function-allow-await
-  "export default async function f() {  await f();\n}")
+  "export default async function f() {\n  await f();\n}")
 
 ;;; Strings