Commit 336edeead9c2008248e5723581668c226745bcda
2021-11-22T13:14:09
ERB: Better embedding of Ruby (#3192)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
diff --git a/components/prism-erb.js b/components/prism-erb.js
index 3f118cf..21dd7c2 100644
--- a/components/prism-erb.js
+++ b/components/prism-erb.js
@@ -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;
diff --git a/components/prism-erb.min.js b/components/prism-erb.min.js
index c7add59..9e38fee 100644
--- a/components/prism-erb.min.js
+++ b/components/prism-erb.min.js
@@ -1 +1 @@
-!function(n){n.languages.erb=n.languages.extend("ruby",{}),n.languages.insertBefore("erb","comment",{delimiter:{pattern:/^<%=?|%>$/,alias:"punctuation"}}),n.hooks.add("before-tokenize",function(e){n.languages["markup-templating"].buildPlaceholders(e,"erb",/<%=?(?:[^\r\n]|[\r\n](?!=begin)|[\r\n]=begin\s(?:[^\r\n]|[\r\n](?!=end))*[\r\n]=end)+?%>/g)}),n.hooks.add("after-tokenize",function(e){n.languages["markup-templating"].tokenizePlaceholders(e,"erb")})}(Prism);
\ No newline at end of file
+!function(n){n.languages.erb={delimiter:{pattern:/^(\s*)<%=?|%>(?=\s*$)/,lookbehind:!0,alias:"punctuation"},ruby:{pattern:/\s*\S[\s\S]*/,alias:"language-ruby",inside:n.languages.ruby}},n.hooks.add("before-tokenize",function(e){n.languages["markup-templating"].buildPlaceholders(e,"erb",/<%=?(?:[^\r\n]|[\r\n](?!=begin)|[\r\n]=begin\s(?:[^\r\n]|[\r\n](?!=end))*[\r\n]=end)+?%>/g)}),n.hooks.add("after-tokenize",function(e){n.languages["markup-templating"].tokenizePlaceholders(e,"erb")})}(Prism);
\ No newline at end of file
diff --git a/tests/languages/erb+haml/erb_inclusion.test b/tests/languages/erb+haml/erb_inclusion.test
index 88bb3c5..be2a7b1 100644
--- a/tests/languages/erb+haml/erb_inclusion.test
+++ b/tests/languages/erb+haml/erb_inclusion.test
@@ -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", "%>"]
]]
]]
diff --git a/tests/languages/erb/erb_feature.test b/tests/languages/erb/erb_feature.test
index cb86983..309680b 100644
--- a/tests/languages/erb/erb_feature.test
+++ b/tests/languages/erb/erb_feature.test
@@ -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.
\ No newline at end of file
+Checks for ERB tags.
diff --git a/tests/languages/erb/erb_in_markup_feature.test b/tests/languages/erb/erb_in_markup_feature.test
index 20719ea..ca0793a 100644
--- a/tests/languages/erb/erb_in_markup_feature.test
+++ b/tests/languages/erb/erb_in_markup_feature.test
@@ -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", "%>"]
]]
]
diff --git a/tests/languages/erb/issue1767.test b/tests/languages/erb/issue1767.test
index 9f48ce9..57b71a9 100644
--- a/tests/languages/erb/issue1767.test
+++ b/tests/languages/erb/issue1767.test
@@ -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", "%>"]
]]
]