Teach js-mode about ES6 template strings

* lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4bc0af3eff9ed5b060f6e6880e47ef8e0b5e942..3486c3806fd84945bb6f50fc2bfab4cc5c7f7416 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-05  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/js.el (js-mode-syntax-table): Add an entry for `.
+
 2015-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        Replace *-function vars with generic functions in cl-generic.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index c25e52cdc6a0f498681d10176b3362ad1e021796..d7712e4c49e586eda19af8bf38df72c87459b97c 100644 (file)
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -534,6 +534,7 @@ getting timeout messages."
   (let ((table (make-syntax-table)))
     (c-populate-syntax-table table)
     (modify-syntax-entry ?$ "_" table)
+    (modify-syntax-entry ?` "\"" table)
     table)
   "Syntax table for `js-mode'.")
 

diff --git a/test/indent/js.js b/test/indent/js.js
index 2d458e1b769cd2404b27870944962ff25c91eb8c..d330fa06d5bc749dd4288af53ae6cd0ffbfd0aaf 100644 (file)
--- a/test/indent/js.js
+++ b/test/indent/js.js
@@ -60,3 +60,6 @@ var evens = [e for each (e in range(0, 21))
 a++
 b +=
   c
+
+baz(`http://foo.bar/${tee}`)
+  .qux();