From: Dmitry Gutov <dgutov@yandex.ru>
Date: Tue, 1 Dec 2015 03:40:57 +0000 (+0200)
Subject: Don't mistake certain JS method calls for keywords
X-Git-Tag: emacs-25.0.90~574
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48471e9614c5a0d1cf63a4604970a45931092230;p=emacs.git

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).
---

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."
                    (skip-syntax-backward " ")
                    (skip-syntax-backward "w_")
                    (looking-at js--possibly-braceless-keyword-re))
+                 (memq (char-before) '(?\s ?\t ?\n ?\}))
                  (not (js--end-of-do-while-loop-p))))
       (save-excursion
         (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 {
   }
 }
 
+if (true)
+  1
+else
+  2
+
+Foobar
+  .find()
+  .catch((err) => {
+    return 2;
+  })
+  .then((num) => {
+    console.log(num);
+  });
+
 // Local Variables:
 // indent-tabs-mode: nil
 // js-indent-level: 2