Merge pull request #332 from bolivier/master

Allow space before global declaration

diff --git a/js2-mode.el b/js2-mode.el
index 9515e2703ce33fd56a81f5d6a674ff52756a02f3..238440c8f7a7f3582e44019f0ff5f8d180523e9b 100644 (file)
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -7264,7 +7264,7 @@ are ignored."
            when (and (eq 'block (js2-comment-node-format node))
                      (save-excursion
                        (goto-char (js2-node-abs-pos node))
-                       (looking-at "/\\*global ")))
+                       (looking-at "/\\* *global ")))
            append (js2-get-jslint-globals-in
                    (match-end 0)
                    (js2-node-abs-end node))))

diff --git a/tests/externs.el b/tests/externs.el
index 40957f600cf85fa3636fb23573562c0a36b9d274..09a60a9d3f9e89cc817696fecae9415316871c45 100644 (file)
--- a/tests/externs.el
+++ b/tests/externs.el
@@ -42,6 +42,13 @@
     (should (equal (js2-get-jslint-globals)
                    '("quux" "tee" "$")))))
 
+(ert-deftest js2-finds-jslint-globals-with-space ()
+  (with-temp-buffer
+    (insert "/* global foo, bar:false, baz:true")
+    (js2-mode)
+    (should (equal (js2-get-jslint-globals)
+                   '("foo" "bar" "baz")))))
+
 ;;;TODO
 ;; ensure that any symbols bound with the import syntax are added to the extern list
 ;; ensure that any symbols bound with the export syntax exist in the file scope