Handle quotes inside curly braces

ccampbell · Apr 4, 2015 · 34b9c62 · 34b9c62
1 parent c2f5b0a
commit 34b9c62
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -209,4 +209,16 @@ describe(language, function() {
         '<span class="storage">var</span> <span class="entity function">parseAndHighlight</span> <span class="keyword operator">=</span> <span class="keyword">function</span>() {};\n' +
         '<span class="storage">var</span> <span class="entity function">parseAndHighlight2</span> <span class="keyword operator">=</span> <span class="keyword">function</span>() {};'
     );
+
+    run(
+        language,
+
+        'quotes inside curly brackets',
+
+        '{\' \'}\n' +
+        'var str = \'something\';',
+
+        '{<span class="string">\' \'</span>}\n' +
+        '<span class="keyword">var</span> str <span class="keyword operator">=</span> <span class="string">\'something\'</span>;'
+    );
 });
diff --git 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',