diff --git a/js/language/generic.js b/js/language/generic.js index 7e1dde65..6c1b010d 100644 --- a/js/language/generic.js +++ b/js/language/generic.js @@ -2,7 +2,7 @@ * Generic language patterns * * @author Craig Campbell - * @version 1.0.11 + * @version 1.0.13 */ Rainbow.extend([ { @@ -25,7 +25,7 @@ Rainbow.extend([ } } }, - 'pattern': /(\(|\s|\[|\=|:|\+|\.)(('|")([^\\\1]|\\.)*?(\3))/gm + 'pattern': /(\(|\s|\[|\=|:|\+|\.|\{)(('|")([^\\\1]|\\.)*?(\3))/gm }, { 'name': 'comment', diff --git a/tests/language/test.javascript.js b/tests/language/test.javascript.js index 9d621b1e..12223f47 100644 --- a/tests/language/test.javascript.js +++ b/tests/language/test.javascript.js @@ -209,4 +209,16 @@ describe(language, function() { 'var parseAndHighlight = function() {};\n' + 'var parseAndHighlight2 = function() {};' ); + + run( + language, + + 'quotes inside curly brackets', + + '{\' \'}\n' + + 'var str = \'something\';', + + '{\' \'}\n' + + 'var str = \'something\';' + ); }); diff --git a/util/builder.py b/util/builder.py index 87ad37e3..9be89ebb 100644 --- a/util/builder.py +++ b/util/builder.py @@ -18,7 +18,7 @@ def __init__(self, js_path, closure_path, theme_path=None): 'coffeescript': '1.0', 'css': '1.0.9', 'd': '1.0', - 'generic': '1.0.12', + 'generic': '1.0.13', 'go': '1.0', 'haskell': '1.0.1', 'html': '1.0.9',