[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 173d1c8 101/110: Merge pull request #332 from bolivier/mas
From: |
Dmitry Gutov |
Subject: |
[elpa] master 173d1c8 101/110: Merge pull request #332 from bolivier/master |
Date: |
Thu, 23 Jun 2016 01:13:03 +0000 (UTC) |
branch: master
commit 173d1c84078afa9d0ee72d2b641354860793905f
Merge: 910520e 12586e5
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge pull request #332 from bolivier/master
Allow space before global declaration
---
js2-mode.el | 2 +-
tests/externs.el | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/js2-mode.el b/js2-mode.el
index 9515e27..238440c 100644
--- 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 40957f6..09a60a9 100644
--- 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
- [elpa] master 6399bec 001/110: Support ES(7) async/await syntax; Closes #185, (continued)
- [elpa] master 6399bec 001/110: Support ES(7) async/await syntax; Closes #185, Dmitry Gutov, 2016/06/22
- [elpa] master fa0aa09 060/110: Merge pull request #294 from lunaryorn/patch-1, Dmitry Gutov, 2016/06/22
- [elpa] master ec7932d 047/110: Merge pull request #283 from XeCycle/master-with-async, Dmitry Gutov, 2016/06/22
- [elpa] master e44d9e1 088/110: Merge pull request #325 from phst/all-tests, Dmitry Gutov, 2016/06/22
- [elpa] master 812df51 091/110: Merge pull request #326 from phst/compiler-warning-25, Dmitry Gutov, 2016/06/22
- [elpa] master de5b31c 085/110: Fix the tests broken in the previous commit, Dmitry Gutov, 2016/06/22
- [elpa] master f130121 095/110: Merge pull request #328 from XeCycle/iname-color, Dmitry Gutov, 2016/06/22
- [elpa] master 9586f45 096/110: Add :warnings-count keyword argument, Dmitry Gutov, 2016/06/22
- [elpa] master e5e4fa4 105/110: Add js2-mode-assume-strict custom variable, Dmitry Gutov, 2016/06/22
- [elpa] master bb0acf5 106/110: Merge pull request #342 from shicks/strict, Dmitry Gutov, 2016/06/22
- [elpa] master 173d1c8 101/110: Merge pull request #332 from bolivier/master,
Dmitry Gutov <=
- [elpa] master c162f35 092/110: Colorize contextual keywords as & from in import & export, Dmitry Gutov, 2016/06/22
- [elpa] master 66fe8de 107/110: js2-define-symbol: Treat const same as let, Dmitry Gutov, 2016/06/22
- [elpa] master 04f3d4b 110/110: Merge commit '0cda39255827f283e7578cd469ae42daad9556a2' from js2-mode, Dmitry Gutov, 2016/06/22