[elpa] master ba3263b 28/38: Merge pull request #473 from felipeochoa/namespace-import-error

[Dmitry Gutov]

branch: master
commit ba3263bb1375b5f4f9b6df7bb8d39f4d97f02688
Merge: eba9797 e481404
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #473 from felipeochoa/namespace-import-error
    
    Fix error when parsing malformed namespace import
---
 js2-mode.el     | 9 +++++----
 tests/parser.el | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 74ab3e4..dc3ddaa 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -8761,9 +8761,9 @@ imports or a namespace import that follows it.
         (when ns-import
           (let ((name-node (js2-namespace-import-node-name ns-import)))
             (js2-define-symbol
-             js2-LET (js2-name-node-name name-node) name-node t)))
-        (setf (js2-import-clause-node-namespace-import clause) ns-import)
-        (push ns-import children)))
+             js2-LET (js2-name-node-name name-node) name-node t))
+          (setf (js2-import-clause-node-namespace-import clause) ns-import)
+          (push ns-import children))))
      ((js2-match-token js2-LC)
       (let ((imports (js2-parse-export-bindings t)))
         (setf (js2-import-clause-node-named-imports clause) imports)
@@ -8822,7 +8822,8 @@ The current token must be js2-MUL."
            node)))
       (t
        (js2-unget-token)
-       (js2-report-error "msg.syntax")))))
+       (js2-report-error "msg.syntax")
+       nil))))
 
 
 (defun js2-parse-from-clause ()
diff --git a/tests/parser.el b/tests/parser.el
index 3041dbc..1853f03 100644
--- a/tests/parser.el
+++ b/tests/parser.el
@@ -647,6 +647,11 @@ the test."
       (should (equal "lib" (js2-name-node-name name-node)))
       (should (= 5 (js2-node-pos name-node))))))
 
+(js2-deftest-parse parse-namespace-import-error
+  "import * lib from 'lib';"
+  :syntax-error "import"
+  :errors-count 7)
+
 (js2-deftest parse-from-clause "from 'foo/bar';"
   (js2-init-scanner)
   (let ((from (js2-parse-from-clause)))