Skip to content

ERB: Better embedding of Ruby #3192

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 1 commit into from
Nov 22, 2021
Merged

ERB: Better embedding of Ruby #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions components/prism-erb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
(function (Prism) {

Prism.languages.erb = Prism.languages.extend('ruby', {});
Prism.languages.insertBefore('erb', 'comment', {
Prism.languages.erb = {
'delimiter': {
pattern: /^<%=?|%>$/,
pattern: /^(\s*)<%=?|%>(?=\s*$)/,
lookbehind: true,
alias: 'punctuation'
},
'ruby': {
pattern: /\s*\S[\s\S]*/,
alias: 'language-ruby',
inside: Prism.languages.ruby
}
});
};

Prism.hooks.add('before-tokenize', function (env) {
var erbPattern = /<%=?(?:[^\r\n]|[\r\n](?!=begin)|[\r\n]=begin\s(?:[^\r\n]|[\r\n](?!=end))*[\r\n]=end)+?%>/g;
Expand Down
2 changes: 1 addition & 1 deletion components/prism-erb.min.js
View file
Open in desktop

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

31 changes: 15 additions & 16 deletions tests/languages/erb+haml/erb_inclusion.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,27 @@
["filter-erb", [
["filter-name", ":erb"],
["text", [
["operator", "<"],
["operator", "%"],
["operator", "="],
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]],
["operator", "%"],
["operator", ">"]
["delimiter", "<%="],
["ruby", [
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]]
]],
["delimiter", "%>"]
]]
]],
["punctuation", "~"],
["filter-erb", [
["filter-name", ":erb"],
["text", [
["operator", "<"],
["operator", "%"],
["operator", "="],
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]],
["delimiter", "<%="],
["ruby", [
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]]
]],
["delimiter", "%>"]
]]
]]
Expand Down
32 changes: 19 additions & 13 deletions tests/languages/erb/erb_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,36 @@
[
["erb", [
["delimiter", "<%"],
["comment", "# comment "],
["ruby", [
["comment", "# comment "]
]],
["delimiter", "%>"]
]],
["erb", [
["delimiter", "<%="],
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]],
["ruby", [
" render ",
["variable", "@products"],
["operator", "||"],
["string", ["\"empty_list\""]]
]],
["delimiter", "%>"]
]],
["erb", [
["delimiter", "<%"],
["variable", "@books"],
["punctuation", "."],
["keyword", "each"],
["keyword", "do"],
["operator", "|"],
"book",
["operator", "|"],
["ruby", [
["variable", "@books"],
["punctuation", "."],
["keyword", "each"],
["keyword", "do"],
["operator", "|"],
"book",
["operator", "|"]
]],
["delimiter", "%>"]
]]
]

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

Checks for ERB tags.
Checks for ERB tags.
27 changes: 17 additions & 10 deletions tests/languages/erb/erb_in_markup_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,37 @@ ___ERB1___<%= 1 %>___ERB2___<%= 2 %>
["punctuation", "\""],
["erb", [
["delimiter", "<%="],
["builtin", "Time"],
["punctuation", "."],
"now",
["punctuation", "."],
"strftime",
["punctuation", "("],
["string", ["'%A'"]],
["punctuation", ")"],
["ruby", [
["builtin", "Time"],
["punctuation", "."],
"now",
["punctuation", "."],
"strftime",
["punctuation", "("],
["string", ["'%A'"]],
["punctuation", ")"]
]],
["delimiter", "%>"]
]],
["punctuation", "\""]
]],
["punctuation", ">"]
]],

"\r\n___ERB1___",
["erb", [
["delimiter", "<%="],
["number", "1"],
["ruby", [
["number", "1"]
]],
["delimiter", "%>"]
]],
"___ERB2___",
["erb", [
["delimiter", "<%="],
["number", "2"],
["ruby", [
["number", "2"]
]],
["delimiter", "%>"]
]]
]
Expand Down
24 changes: 19 additions & 5 deletions tests/languages/erb/issue1767.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,42 @@
[
["erb", [
["delimiter", "<%"],
["comment", "# this is a block comment "],
["ruby", [
["comment", "# this is a block comment "]
]],
["delimiter", "%>"]
]],
["erb", [
["delimiter", "<%"],
["comment", "=begin %>\r\n\tblock comment\r\n\t(both lines of both the begin and end tags must be at the start of their lines)\r\n<%\r\n=end"],
["ruby", [
["comment", "=begin %>\r\n\tblock comment\r\n\t(both lines of both the begin and end tags must be at the start of their lines)\r\n<%\r\n=end"]
]],
["delimiter", "%>"]
]],

["erb", [
["delimiter", "<%"],
["comment", "# this is not "],
["ruby", [
["comment", "# this is not "]
]],
["delimiter", "%>"]
]],
["erb", [
["delimiter", "<%"],
["operator", "="], ["keyword", "begin"], ["delimiter", "%>"]
["ruby", [
["operator", "="],
["keyword", "begin"]
]],
["delimiter", "%>"]
]],
"\r\n\tnot a comment\r\n\t",
["erb", [
["delimiter", "<%"],
["operator", "="], ["keyword", "end"], ["delimiter", "%>"]
["ruby", [
["operator", "="],
["keyword", "end"]
]],
["delimiter", "%>"]
]]
]

Expand Down