aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-12-01 05:40:57 +0200
committerDmitry Gutov2015-12-01 05:41:14 +0200
commit48471e9614c5a0d1cf63a4604970a45931092230 (patch)
tree22b4ce5f35158625915547b66e39833425ecc786
parent49689a415c4a83625ba2df127917139e0d98e381 (diff)
downloademacs-48471e9614c5a0d1cf63a4604970a45931092230.tar.gz
emacs-48471e9614c5a0d1cf63a4604970a45931092230.zip
Don't mistake certain JS method calls for keywords
* lisp/progmodes/js.el (js--ctrl-statement-indentation): Braceless keyword can't come after a period (bug#22063).
-rw-r--r--lisp/progmodes/js.el1
-rw-r--r--test/indent/js.js14
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 356a31db094..310b7ba371f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1823,6 +1823,7 @@ nil."
1823 (skip-syntax-backward " ") 1823 (skip-syntax-backward " ")
1824 (skip-syntax-backward "w_") 1824 (skip-syntax-backward "w_")
1825 (looking-at js--possibly-braceless-keyword-re)) 1825 (looking-at js--possibly-braceless-keyword-re))
1826 (memq (char-before) '(?\s ?\t ?\n ?\}))
1826 (not (js--end-of-do-while-loop-p)))) 1827 (not (js--end-of-do-while-loop-p))))
1827 (save-excursion 1828 (save-excursion
1828 (goto-char (match-beginning 0)) 1829 (goto-char (match-beginning 0))
diff --git a/test/indent/js.js b/test/indent/js.js
index d897b9f81e7..9a1e0dc7ad5 100644
--- a/test/indent/js.js
+++ b/test/indent/js.js
@@ -76,6 +76,20 @@ class A {
76 } 76 }
77} 77}
78 78
79if (true)
80 1
81else
82 2
83
84Foobar
85 .find()
86 .catch((err) => {
87 return 2;
88 })
89 .then((num) => {
90 console.log(num);
91 });
92
79// Local Variables: 93// Local Variables:
80// indent-tabs-mode: nil 94// indent-tabs-mode: nil
81// js-indent-level: 2 95// js-indent-level: 2