Rearrange the string and template-string token in JavaScript

It is more likely that single and double quotes appear in a template string, than backticks in a normal string. Fixes issue #963.
PrismJS · Jun 3, 2016 · 1158e46 · 1158e46
1 parent 0c4d8d7
commit 1158e46
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/components/prism-coffeescript.js b/components/prism-coffeescript.js
@@ -86,4 +86,6 @@ Prism.languages.insertBefore('coffeescript', 'keyword', {
 	'property': /(?!\d)\w+(?=\s*:(?!:))/
 });
 
+delete Prism.languages.coffeescript['template-string'];
+
 }(Prism));
diff --git a/components/prism-coffeescript.min.js b/components/prism-coffeescript.min.js
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -13,7 +13,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
-Prism.languages.insertBefore('javascript', 'class-name', {
+Prism.languages.insertBefore('javascript', 'string', {
 	'template-string': {
 		pattern: /`(?:\\\\|\\?[^\\])*?`/,
 		greedy: true,

diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -665,7 +665,7 @@ Prism.languages.insertBefore('javascript', 'keyword', {
 	}
 });
 
-Prism.languages.insertBefore('javascript', 'class-name', {
+Prism.languages.insertBefore('javascript', 'string', {
 	'template-string': {
 		pattern: /`(?:\\\\|\\?[^\\])*?`/,
 		greedy: true,