Add fixes from code review

PrismJS · Mar 21, 2021 · 72a511b · 72a511b
1 parent a9aaeca
commit 72a511b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/components/prism-jexl.js b/components/prism-jexl.js
@@ -1,13 +1,14 @@
 Prism.languages.jexl = {
-	string: /(["'])(?:\\(?:[\s\S])|(?!\1)[^\\])*\1/,
-	transform: {
-		pattern: /\|\s*[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*/,
+	'string': /(["'])(?:\\[\s\S]|(?!\1)[^\\])*\1/,
+	'transform': {
+		pattern: /(\|)\s*[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*/,
 		alias: "function",
+		lookbehind: true
 	},
-	function: /[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*\s*(?=\()/,
-	number: /\b(?:(?:\d*\.\d+)|\d+)/,
-	operator: /[<>]=?|[!=]=?|-|\+|&&|\|\||\/\/?|[?:*^%]/,
-	boolean: /\b(?:true|false)\b/,
-	keyword: /\bin\b/,
-	punctuation: /[{}[\](),.]/,
+	'function': /[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*\s*(?=\()/,
+	'number': /\b\d+(?:\.\d+)?\b|\B\.\d+\b/,
+	'operator': /[<>!]=?|-|\+|&&|==|\|\|?|\/\/?|[?:*^%]/,
+	'boolean': /\b(?:true|false)\b/,
+	'keyword': /\bin\b/,
+	'punctuation': /[{}[\](),.]/,
 };
diff --git a/components/prism-jexl.min.js b/components/prism-jexl.min.js
diff --git a/tests/languages/jexl/operator_feature.test b/tests/languages/jexl/operator_feature.test
@@ -2,7 +2,7 @@
 +
 < <=
 > >=
-= ==
+==
 ! !=
 && ||
 *
@@ -18,7 +18,7 @@
 	["operator", "+"],
 	["operator", "<"], ["operator", "<="],
 	["operator", ">"], ["operator", ">="],
-	["operator", "="], ["operator", "=="],
+	["operator", "=="],
 	["operator", "!"], ["operator", "!="],
 	["operator", "&&"], ["operator", "||"],
 	["operator", "*"],

diff --git a/tests/languages/jexl/transform_feature.test b/tests/languages/jexl/transform_feature.test
@@ -15,28 +15,31 @@ foo|bar(
 ----------------------------------------------------
 
 [
-	["string", "\"foo\""], ["transform", "|bar"],
-	["string", "\"foo\""], ["transform", "| bar"],
+	["string", "\"foo\""], ["operator", "|"], ["transform", "bar"],
+	["string", "\"foo\""], ["operator", "|"], ["transform", " bar"],
 	["string", "\"foo\""],
-	["transform", "|   \r\nbar"],
+	["operator", "|"], ["transform", "   \r\nbar"],
 
-	"\r\n\r\nfoo", ["transform", "|Ý"],
+	"\r\n\r\nfoo", ["operator", "|"], ["transform", "Ý"],
 
 	"\r\n\r\nfoo",
-	["transform", "|bar"],
+	["operator", "|"],
+	["transform", "bar"],
 	["punctuation", "("],
 	["punctuation", ")"],
 
 	"\r\nfoo",
-	["transform", "|bar"],
+	["operator", "|"],
+	["transform", "bar"],
 	["punctuation", "("],
 	["number", "1"],
 	["punctuation", ","],
 	["number", "2"],
 	["punctuation", ")"],
 
 	"\r\nfoo",
-	["transform", "|bar"],
+	["operator", "|"],
+	["transform", "bar"],
 	["punctuation", "("],
 
 	["number", "1"],