[elpa] master 048da26 06/38: Merge pull request #442 from felipeochoa/arrowStatements

[Dmitry Gutov]

branch: master
commit 048da26e17a1011f1466794218ff175acd503c31
Merge: 91c745a 3207e5c
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #442 from felipeochoa/arrowStatements
    
    Correctly handle arrow functions in js2-node-parent-stmt
---
 js2-mode.el      | 3 +--
 tests/consume.el | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 4a9a068..4ba99ec 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -5247,8 +5247,7 @@ appearing in a statement context will have a parent that 
is a
     (if (or (null parent)
             (js2-stmt-node-p parent)
             (and (js2-function-node-p parent)
-                 (not (eq (js2-function-node-form parent)
-                          'FUNCTION_EXPRESSION))))
+                 (eq (js2-function-node-form parent) 'FUNCTION_STATEMENT)))
         parent
       (js2-node-parent-stmt parent))))
 
diff --git a/tests/consume.el b/tests/consume.el
index c48f6a0..8e6ca17 100644
--- a/tests/consume.el
+++ b/tests/consume.el
@@ -20,6 +20,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'js2-mode)
 
 (defun js2-mode--and-parse ()
@@ -73,3 +74,11 @@
                                    t))
      (setq visit-log (nreverse visit-log))
      (should (equal visit-log (list "defaultImport" "a" "b" "c"))))))
+
+(ert-deftest js2-node-parent-stmt/arrow-function ()
+  (ert-with-test-buffer (:name 'js2-node-parent-stmt/arrow-function)
+    (insert "expect(() => ")
+    (save-excursion (insert "func(undefined)).toThrow(/undefined/);"))
+    (js2-mode--and-parse)
+    (let ((parent-stmt (js2-node-parent-stmt (js2-node-at-point))))
+      (should (= (js2-node-abs-pos parent-stmt) 1)))))