[elpa] master 458d3fe 14/22: Merge pull request #221 from jacksonrayhamilton/enclosing-scope

[Dmitry Gutov]

branch: master
commit 458d3feef14b0ab1040c70b59771e4b443ec36e2
Merge: a184642 3b76567
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Merge pull request #221 from jacksonrayhamilton/enclosing-scope
    
    Fix js2-node-get-enclosing-scope
---
 js2-mode.el |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 46ef97d..627a615 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -2307,10 +2307,9 @@ If any given node in NODES is nil, doesn't record that 
link."
 (defun js2-node-get-enclosing-scope (node)
   "Return the innermost `js2-scope' node surrounding NODE.
 Returns nil if there is no enclosing scope node."
-  (let ((parent (js2-node-parent node)))
-    (while (not (js2-scope-p parent))
-      (setq parent (js2-node-parent parent)))
-    parent))
+  (while (and (setq node (js2-node-parent node))
+              (not (js2-scope-p node))))
+  node)
 
 (defun js2-get-defining-scope (scope name &optional point)
   "Search up scope chain from SCOPE looking for NAME, a string or symbol.