Merge branch 'py-functions' of https://github.com/erinwild/prism into…

… erinwild-py-functions # Conflicts: # components/prism-python.js # components/prism-python.min.js
PrismJS · Oct 21, 2017 · 3badd8a · 3badd8a
2 parents 2169c99 + 317f690
commit 3badd8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/components/prism-python.js b/components/prism-python.js
@@ -12,7 +12,7 @@ Prism.languages.python = {
 		greedy: true
 	},
 	'function': {
-		pattern: /((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\()/g,
+		pattern: /((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\s*\()/g,
 		lookbehind: true
 	},
 	'class-name': {

diff --git a/components/prism-python.min.js b/components/prism-python.min.js
diff --git a/tests/languages/python/function_feature.test b/tests/languages/python/function_feature.test
@@ -1,13 +1,15 @@
 def Foo(
 def foo_bar_42(
 def _(
+def foo_ ()
 
 ----------------------------------------------------
 
 [
 	["keyword", "def"], ["function", "Foo"], ["punctuation", "("],
 	["keyword", "def"], ["function", "foo_bar_42"], ["punctuation", "("],
-	["keyword", "def"], ["function", "_"], ["punctuation", "("]
+	["keyword", "def"], ["function", "_"], ["punctuation", "("],
+	["keyword", "def"], ["function", "foo_"], ["punctuation", "("], ["punctuation", ")"]
 ]
 
 ----------------------------------------------------