Skip to content

Regex: Changed how languages embed regexes #2532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RunDevelopment merged 3 commits into from
Aug 31, 2020
Merged

Regex: Changed how languages embed regexes #2532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2208d3c
Regex: Changed with langauges embed regexes
RunDevelopment Aug 27, 2020
ff1df77
Better token names
RunDevelopment Aug 27, 2020
f038bc7
Merge branch 'master' into regex-deps
RunDevelopment Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Regex: Changed with langauges embed regexes
  • Loading branch information
@RunDevelopment
RunDevelopment committed Aug 27, 2020
commit 2208d3c842b421653446ca07d64613f163607e83
2 changes: 1 addition & 1 deletion components.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"title": "JavaScript",
"require": "clike",
"modify": "markup",
"optional": "regex",
"alias": "js",
"option": "default"
},
Expand Down Expand Up @@ -210,7 +211,7 @@
"oscript": "OneScript"
},
"owner": "Diversus23"
},
},
"c": {
"title": "C",
"require": "clike",
Expand Down Expand Up @@ -963,14 +964,6 @@
},
"regex": {
"title": "Regex",
"modify": [
"actionscript",
"coffeescript",
"flow",
"javascript",
"typescript",
"vala"
],
"owner": "RunDevelopment"
},
"renpy": {
Expand Down Expand Up @@ -1175,6 +1168,7 @@
"vala": {
"title": "Vala",
"require": "clike",
"optional": "regex",
"owner": "TemplarVolk"
},
"vbnet": {
Expand Down
11 changes: 10 additions & 1 deletion components/prism-javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@ Prism.languages.insertBefore('javascript', 'keyword', {
'regex': {
pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
lookbehind: true,
greedy: true
greedy: true,
inside: {
'language-regex': {
pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/,
lookbehind: true,
inside: Prism.languages.regex
},
'regex-flags': /[a-z]+$/,
'regex-delimiter': /^\/|\/$/
}
},
// This must be declared before keyword because we use "function" inside the look-forward
'function-variable': {
Expand Down
2 changes: 1 addition & 1 deletion components/prism-javascript.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 0 additions & 23 deletions components/prism-regex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,27 +101,4 @@
}
};


[
'actionscript',
'coffescript',
'flow',
'javascript',
'typescript',
'vala'
].forEach(function (lang) {
var grammar = Prism.languages[lang];
if (grammar) {
grammar['regex'].inside = {
'language-regex': {
pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/i,
lookbehind: true,
inside: Prism.languages.regex
},
'regex-flags': /[a-z]+$/i,
'regex-delimiter': /^\/|\/$/,
};
}
});

}(Prism))
2 changes: 1 addition & 1 deletion components/prism-regex.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion components/prism-vala.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ Prism.languages.insertBefore('vala','string', {
Prism.languages.insertBefore('vala', 'keyword', {
'regex': {
pattern: /\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[imsx]{0,4}(?=\s*(?:$|[\r\n,.;})\]]))/,
greedy: true
greedy: true,
inside: {
'language-regex': {
pattern: /^(\/)[\s\S]+(?=\/[a-z]+$)/,
lookbehind: true,
inside: Prism.languages.regex
},
'regex-flags': /[a-z]+$/,
'regex-delimiter': /^\/|\/$/
}
}
});
2 changes: 1 addition & 1 deletion components/prism-vala.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion prism.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,16 @@ Prism.languages.insertBefore('javascript', 'keyword', {
'regex': {
pattern: /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)\/(?:\[(?:[^\]\\\r\n]|\\.)*]|\\.|[^/\\\[\r\n])+\/[gimyus]{0,6}(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/,
lookbehind: true,
greedy: true
greedy: true,
inside: {
'language-regex': {
pattern: /^(\/)[\s\S]+(?=\/[gimyus]*$)/,
lookbehind: true,
inside: Prism.languages.regex
},
'regex-flags': /[gimyus]+$/,
'regex-delimiter': /^\/|\/$/
}
},
// This must be declared before keyword because we use "function" inside the look-forward
'function-variable': {
Expand Down
104 changes: 88 additions & 16 deletions tests/languages/javascript/regex_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,110 @@ yield /regex/;
----------------------------------------------------

[
["regex", "/foo bar/"], ["punctuation", ";"],
["regex", "/foo/gimyus"], ["punctuation", ","],
["regex", "/[\\[\\]]{2,4}(?:foo)*/"], ["punctuation", ";"],
["regex", "/foo\"test\"bar/"], ["punctuation", ";"],
["regex", "/foo\\//"], ["punctuation", ";"],
["regex", "/[]/"], ["punctuation", ";"],
["regex", "/[\\]/]/"], ["punctuation", ";"],
["number", "1"], ["operator", "/"], ["number", "4"], ["operator", "+"], ["string", "\"/, not a regex\""], ["punctuation", ";"],
["regex", "/ '1' '2' '3' '4' '5' /"],
["punctuation", "["], ["regex", "/foo/"], ["punctuation", "]"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo bar"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo"],
["regex-delimiter", "/"],
["regex-flags", "gimyus"]
]],
["punctuation", ","],
["regex", [
["regex-delimiter", "/"],
["language-regex", "[\\[\\]]{2,4}(?:foo)*"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo\"test\"bar"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo\\/"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "[]"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "[\\]/]"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["number", "1"],
["operator", "/"],
["number", "4"],
["operator", "+"],
["string", "\"/, not a regex\""],
["punctuation", ";"],
["regex", [
["regex-delimiter", "/"],
["language-regex", " '1' '2' '3' '4' '5' "],
["regex-delimiter", "/"]
]],
["punctuation", "["],
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo"],
["regex-delimiter", "/"]
]],
["punctuation", "]"],

["keyword", "let"],
" a ",
["operator", "="],
["regex", "/regex/m"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "regex"],
["regex-delimiter", "/"],
["regex-flags", "m"]
]],
["comment", "// comment"],
["keyword", "let"],
" b ",
["operator", "="],
" condition ",
["operator", "?"],
["regex", "/regex/"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "regex"],
["regex-delimiter", "/"]
]],
["operator", ":"],
["regex", "/another one/"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "another one"],
["regex-delimiter", "/"]
]],
["keyword", "return"],
["regex", "/regex/"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "regex"],
["regex-delimiter", "/"]
]],
["punctuation", ";"],
["keyword", "yield"],
["regex", "/regex/"],
["regex", [
["regex-delimiter", "/"],
["language-regex", "regex"],
["regex-delimiter", "/"]
]],
["punctuation", ";"]
]

----------------------------------------------------

Checks for regex.
Checks for regex.
11 changes: 9 additions & 2 deletions tests/languages/markup+javascript+csharp+aspnet/script_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
["punctuation", ">"]
]],
["asp-script", [
["preprocessor", ["#", ["directive", "pragma"]]]
["preprocessor", [
"#",
["directive", "pragma"]
]]
]],
["tag", [
["tag", [
Expand All @@ -40,7 +43,11 @@
]],
["script", [
["language-javascript", [
["regex", "/foo/"]
["regex", [
["regex-delimiter", "/"],
["language-regex", "foo"],
["regex-delimiter", "/"]
]]
]]
]],
["tag", [
Expand Down