summaryrefslogtreecommitdiff
path: root/test/manual/indent/js.js
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-12-29 21:39:08 -0800
committerJohn Wiegley <johnw@newartisans.com>2015-12-29 21:39:08 -0800
commitec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch)
tree7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /test/manual/indent/js.js
parentd259328fb87db8cc67d52771efcfa653e52c5b71 (diff)
parente823c34072bf045800d91e12c7ddb61fa23c6e30 (diff)
downloademacs-25-merge.tar.gz
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'test/manual/indent/js.js')
-rw-r--r--test/manual/indent/js.js14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/manual/indent/js.js b/test/manual/indent/js.js
index d897b9f81e7..9a1e0dc7ad5 100644
--- a/test/manual/indent/js.js
+++ b/test/manual/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