Python: Highlight triple-quoted strings before comments. Fix #815

PrismJS · Oct 26, 2015 · 90fbf0b · 90fbf0b
1 parent 81933ee
commit 90fbf0b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/components/prism-python.js b/components/prism-python.js
@@ -1,9 +1,13 @@
 Prism.languages.python= {
+	'triple-quoted-string': {
+		pattern: /"""[\s\S]+?"""|'''[\s\S]+?'''/,
+		alias: 'string'
+	},
 	'comment': {
 		pattern: /(^|[^\\])#.*/,
 		lookbehind: true
 	},
-	'string': /"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(?:\\?.)*?\1/,
+	'string': /("|')(?:\\?.)*?\1/,
 	'function' : {
 		pattern: /((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\()/g,
 		lookbehind: true

diff --git a/components/prism-python.min.js b/components/prism-python.min.js
diff --git a/tests/languages/python/string_feature.test b/tests/languages/python/string_feature.test
@@ -1,9 +1,3 @@
-"""foobar"""
-"""fo"o
-bar"""
-'''foobar'''
-'''fo'o
-bar'''
 ""
 "fo\"obar"
 ''
@@ -12,10 +6,6 @@ bar'''
 ----------------------------------------------------
 
 [
-	["string", "\"\"\"foobar\"\"\""],
-	["string", "\"\"\"fo\"o\r\nbar\"\"\""],
-	["string", "'''foobar'''"],
-	["string", "'''fo'o\r\nbar'''"],
 	["string", "\"\""],
 	["string", "\"fo\\\"obar\""],
 	["string", "''"],

diff --git a/tests/languages/python/triple-quoted-string_feature.test b/tests/languages/python/triple-quoted-string_feature.test
@@ -0,0 +1,21 @@
+"""foobar"""
+"""fo"o
+#bar
+baz"""
+'''foobar'''
+'''fo'o
+#bar
+baz'''
+
+----------------------------------------------------
+
+[
+	["triple-quoted-string", "\"\"\"foobar\"\"\""],
+	["triple-quoted-string", "\"\"\"fo\"o\r\n#bar\r\nbaz\"\"\""],
+	["triple-quoted-string", "'''foobar'''"],
+	["triple-quoted-string", "'''fo'o\r\n#bar\r\nbaz'''"]
+]
+
+----------------------------------------------------
+
+Checks for triple-quoted strings.