Kotlin: Added support for backticks in function names (#2489)

PrismJS · Nov 15, 2020 · a5107d5 · a5107d5
1 parent f217ab7
commit a5107d5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/components/prism-kotlin.js b/components/prism-kotlin.js
@@ -6,10 +6,14 @@
 			lookbehind: true
 		},
 		'function': [
-			/\w+(?=\s*\()/,
 			{
-				pattern: /(\.)\w+(?=\s*\{)/,
-				lookbehind: true
+				pattern: /(?:`[^\r\n`]+`|\w+)(?=\s*\()/,
+				greedy: true
+			},
+			{
+				pattern: /(\.)(?:`[^\r\n`]+`|\w+)(?=\s*\{)/,
+				lookbehind: true,
+				greedy: true
 			}
 		],
 		'number': /\b(?:0[xX][\da-fA-F]+(?:_[\da-fA-F]+)*|0[bB][01]+(?:_[01]+)*|\d+(?:_\d+)*(?:\.\d+(?:_\d+)*)?(?:[eE][+-]?\d+(?:_\d+)*)?[fFL]?)\b/,

diff --git a/components/prism-kotlin.min.js b/components/prism-kotlin.min.js
diff --git a/tests/languages/kotlin/function_feature.test b/tests/languages/kotlin/function_feature.test
@@ -1,14 +1,23 @@
 foo()
 foo_Bar_42()
 list.filter {}
+`function 1`()
+` !"#$%^&()*+,=?@{|}~-_`()
+list.`take 1` {}
+`make fun`()
 
 ----------------------------------------------------
 
 [
 	["function", "foo"], ["punctuation", "("], ["punctuation", ")"],
 	["function", "foo_Bar_42"], ["punctuation", "("], ["punctuation", ")"],
 	"\r\nlist", ["punctuation", "."],
-	["function", "filter"], ["punctuation", "{"], ["punctuation", "}"]
+	["function", "filter"], ["punctuation", "{"], ["punctuation", "}"],
+	["function", "`function 1`"], ["punctuation", "("], ["punctuation", ")"],
+	["function", "` !\"#$%^&()*+,=?@{|}~-_`"], ["punctuation", "("], ["punctuation", ")"],
+	"\r\nlist", ["punctuation", "."],
+	["function", "`take 1`"], ["punctuation", "{"], ["punctuation", "}"],
+	["function", "`make fun`"], ["punctuation", "("], ["punctuation", ")"]
 ]
 
 ----------------------------------------------------