]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't mistake certain JS method calls for keywords
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 1 Dec 2015 03:40:57 +0000 (05:40 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 1 Dec 2015 03:41:14 +0000 (05:41 +0200)
* lisp/progmodes/js.el (js--ctrl-statement-indentation):
Braceless keyword can't come after a period (bug#22063).

lisp/progmodes/js.el
test/indent/js.js

index 356a31db0944f77eb84db483b99c88bb3a6d2266..310b7ba371f64807e5912ca8bfe40e876119571b 100644 (file)
@@ -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))
index d897b9f81e77b7f407f3d8bced6e161dfce49520..9a1e0dc7ad5b3e141a75a787866d2232aa70f5e8 100644 (file)
@@ -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