Handlebars: Fix empty strings, add plus sign in exponential notation,…

… improve block pattern and variable pattern.
PrismJS · Aug 23, 2015 · c477f9a · c477f9a
1 parent bbe68ac
commit c477f9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/components/prism-handlebars.js b/components/prism-handlebars.js
@@ -10,11 +10,11 @@
 					pattern: /^\{\{\{?|\}\}\}?$/i,
 					alias: 'punctuation'
 				},
-				'string': /(["'])(\\?.)+?\1/,
-				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+				'string': /(["'])(\\?.)*?\1/,
+				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/,
 				'boolean': /\b(true|false)\b/,
 				'block': {
-					pattern: /^(\s*~?\s*)[#\/]\S+/i,
+					pattern: /^(\s*~?\s*)[#\/]\S+?(?=\s*~?\s*$|\s)/i,
 					lookbehind: true,
 					alias: 'keyword'
 				},
@@ -26,7 +26,7 @@
 					}
 				},
 				'punctuation': /[!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]/,
-				'variable': /[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/
+				'variable': /[^!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~\s]+/
 			}
 		}
 	});

diff --git a/components/prism-handlebars.min.js b/components/prism-handlebars.min.js