Skip to content

Commit 72a511b

Browse files
committed
Add fixes from code review
1 parent a9aaeca commit 72a511b

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

components/prism-jexl.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
Prism.languages.jexl = {
2-
string: /(["'])(?:\\(?:[\s\S])|(?!\1)[^\\])*\1/,
3-
transform: {
4-
pattern: /\|\s*[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*/,
2+
'string': /(["'])(?:\\[\s\S]|(?!\1)[^\\])*\1/,
3+
'transform': {
4+
pattern: /(\|)\s*[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*/,
55
alias: "function",
6+
lookbehind: true
67
},
7-
function: /[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*\s*(?=\()/,
8-
number: /\b(?:(?:\d*\.\d+)|\d+)/,
9-
operator: /[<>]=?|[!=]=?|-|\+|&&|\|\||\/\/?|[?:*^%]/,
10-
boolean: /\b(?:true|false)\b/,
11-
keyword: /\bin\b/,
12-
punctuation: /[{}[\](),.]/,
8+
'function': /[a-zA-Zа-яА-Я_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$][a-zA-Zа-яА-Я0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF$]*\s*(?=\()/,
9+
'number': /\b\d+(?:\.\d+)?\b|\B\.\d+\b/,
10+
'operator': /[<>!]=?|-|\+|&&|==|\|\|?|\/\/?|[?:*^%]/,
11+
'boolean': /\b(?:true|false)\b/,
12+
'keyword': /\bin\b/,
13+
'punctuation': /[{}[\](),.]/,
1314
};

components/prism-jexl.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/languages/jexl/operator_feature.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+
33
< <=
44
> >=
5-
= ==
5+
==
66
! !=
77
&& ||
88
*
@@ -18,7 +18,7 @@
1818
["operator", "+"],
1919
["operator", "<"], ["operator", "<="],
2020
["operator", ">"], ["operator", ">="],
21-
["operator", "="], ["operator", "=="],
21+
["operator", "=="],
2222
["operator", "!"], ["operator", "!="],
2323
["operator", "&&"], ["operator", "||"],
2424
["operator", "*"],

tests/languages/jexl/transform_feature.test

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,31 @@ foo|bar(
1515
----------------------------------------------------
1616

1717
[
18-
["string", "\"foo\""], ["transform", "|bar"],
19-
["string", "\"foo\""], ["transform", "| bar"],
18+
["string", "\"foo\""], ["operator", "|"], ["transform", "bar"],
19+
["string", "\"foo\""], ["operator", "|"], ["transform", " bar"],
2020
["string", "\"foo\""],
21-
["transform", "| \r\nbar"],
21+
["operator", "|"], ["transform", " \r\nbar"],
2222

23-
"\r\n\r\nfoo", ["transform", "|Ý"],
23+
"\r\n\r\nfoo", ["operator", "|"], ["transform", "Ý"],
2424

2525
"\r\n\r\nfoo",
26-
["transform", "|bar"],
26+
["operator", "|"],
27+
["transform", "bar"],
2728
["punctuation", "("],
2829
["punctuation", ")"],
2930

3031
"\r\nfoo",
31-
["transform", "|bar"],
32+
["operator", "|"],
33+
["transform", "bar"],
3234
["punctuation", "("],
3335
["number", "1"],
3436
["punctuation", ","],
3537
["number", "2"],
3638
["punctuation", ")"],
3739

3840
"\r\nfoo",
39-
["transform", "|bar"],
41+
["operator", "|"],
42+
["transform", "bar"],
4043
["punctuation", "("],
4144

4245
["number", "1"],

0 commit comments

Comments
 (0)