Make docstring regex non-greedy. Fixes #89

ccampbell · Nov 27, 2012 · e0b555d · e0b555d
1 parent 355ffce
commit e0b555d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/js/language/python.js b/js/language/python.js
@@ -2,7 +2,7 @@
  * Python patterns
  *
  * @author Craig Campbell
- * @version 1.0.6
+ * @version 1.0.7
  */
 Rainbow.extend('python', [
     /**
@@ -79,6 +79,6 @@ Rainbow.extend('python', [
     },
     {
         'name': 'comment.docstring',
-        'pattern': /('{3}|"{3})[\s\S]*\1/gm
+        'pattern': /('{3}|"{3})[\s\S]*?\1/gm
     }
 ]);
diff --git a/tests/language/python-test.js b/tests/language/python-test.js
@@ -151,4 +151,24 @@ RainbowTester.run(
     'yes"""</span>'
 );
 
+RainbowTester.run(
+    'multiple docstrings',
+
+    '"""\n' +
+    'x\n' +
+    '"""\n' +
+    '2 + 2\n' +
+    '"""\n' +
+    'y\n' +
+    '"""',
+
+    '<span class="comment docstring">"""\n' +
+    'x\n' +
+    '"""</span>\n' +
+    '<span class="constant numeric">2</span> <span class="keyword operator">+</span> <span class="constant numeric">2</span>\n' +
+    '<span class="comment docstring">"""\n' +
+    'y\n' +
+    '"""</span>'
+);
+
 RainbowTester.endTest('python');
diff --git a/util/builder.py b/util/builder.py
@@ -24,7 +24,7 @@ def __init__(self, js_path, closure_path, theme_path=None):
             'javascript': '1.0.7',
             'lua': '1.0',
             'php': '1.0.6',
-            'python': '1.0.6',
+            'python': '1.0.7',
             'r': '1.0',
             'ruby': '1.0.5',
             'scheme': '1.0',