[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 8088e75 21/45: Add js2-language-version check for template
From: |
Dmitry Gutov |
Subject: |
[elpa] master 8088e75 21/45: Add js2-language-version check for template literals |
Date: |
Mon, 02 Feb 2015 03:18:41 +0000 |
branch: master
commit 8088e7500d03f3bc92aaeba16a649135416ab70e
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Add js2-language-version check for template literals
---
js2-mode.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/js2-mode.el b/js2-mode.el
index e1647ac..824e5da 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -5765,7 +5765,9 @@ its relevant fields and puts it into `js2-ti-tokens'."
(js2-string-to-number str base)))
(throw 'return js2-NUMBER))
;; is it a string?
- (when (memq c '(?\" ?\' ?`))
+ (when (or (memq c '(?\" ?\'))
+ (and (>= js2-language-version 200)
+ (= c ?`)))
(throw 'return
(js2-get-string-or-template-token c token)))
(js2-ts-return token
- [elpa] master 3f09ff3 09/45: Fix string literals in parser.el test harness., (continued)
- [elpa] master 3f09ff3 09/45: Fix string literals in parser.el test harness., Dmitry Gutov, 2015/02/01
- [elpa] master d0c6bf3 18/45: Comment the new token types, Dmitry Gutov, 2015/02/01
- [elpa] master 9525eb3 10/45: Merge branch 'master' of github.com:shicks/js2-mode into shicks-master, Dmitry Gutov, 2015/02/01
- [elpa] master c910d1b 19/45: Parse tagged templates, Dmitry Gutov, 2015/02/01
- [elpa] master 8df508e 16/45: Handle template substitutions, Dmitry Gutov, 2015/02/01
- [elpa] master 92063fe 22/45: Fix js2-visit-tagged-template, Dmitry Gutov, 2015/02/01
- [elpa] master 94c2ec9 20/45: Drop `js2-allow-keywords-as-property-names' and `js2-valid-prop-name-token', Dmitry Gutov, 2015/02/01
- [elpa] master ab82544 23/45: Do not declare fn expression's name in the enclosing scope, Dmitry Gutov, 2015/02/01
- [elpa] master e6dc986 24/45: Limit the scope of `with-silent-modifications', Dmitry Gutov, 2015/02/01
- [elpa] master 6a4e84b 26/45: js2-parse-for: Reword docstring and comments, Dmitry Gutov, 2015/02/01
- [elpa] master 8088e75 21/45: Add js2-language-version check for template literals,
Dmitry Gutov <=
- [elpa] master 395d4ae 29/45: Highlight methods with font-lock-function-name-face, Dmitry Gutov, 2015/02/01
- [elpa] master a117465 32/45: Handle "arguments" specially, Dmitry Gutov, 2015/02/01
- [elpa] master 3c4367f 25/45: Make catch-node inherit from scope, Dmitry Gutov, 2015/02/01
- [elpa] master 65bd910 35/45: `js2-time' remove unused variable., Dmitry Gutov, 2015/02/01
- [elpa] master e109213 36/45: Merge pull request #203 from cheunghy/master, Dmitry Gutov, 2015/02/01
- [elpa] master b0ea681 33/45: Add animationFrame functions, Dmitry Gutov, 2015/02/01
- [elpa] master 590db34 37/45: js2-parse-class-stmt: Define the class in the current scope, Dmitry Gutov, 2015/02/01
- [elpa] master ba564b7 38/45: Handle arrowfun empty-args in js2-parse-paren-expr-or-generator-comp, Dmitry Gutov, 2015/02/01
- [elpa] master 874cf77 31/45: js2-get-token-internal-1: Reindent, Dmitry Gutov, 2015/02/01
- [elpa] master 58c6636 27/45: Support ES6 module syntax, Dmitry Gutov, 2015/02/01