Commit 29643f4e462d2fdac353c44c2d826f0c4c5dc62f
2015-10-06T08:48:21
Simplify patterns for <style> and <script> tags
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 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391
diff --git a/components/prism-aspnet.js b/components/prism-aspnet.js
index 291823e..9511e45 100644
--- a/components/prism-aspnet.js
+++ b/components/prism-aspnet.js
@@ -29,23 +29,8 @@ Prism.languages.insertBefore('aspnet', 'comment', {
// script runat="server" contains csharp, not javascript
Prism.languages.insertBefore('aspnet', Prism.languages.javascript ? 'script' : 'tag', {
'asp script': {
- pattern: /<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,
- inside: {
- tag: {
- pattern: /<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,
- inside: Prism.languages.aspnet.tag.inside
- },
- rest: Prism.languages.csharp || {}
- }
+ pattern: /(<script(?=.*runat=['"]?server['"]?)[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,
+ lookbehind: true,
+ inside: Prism.languages.csharp || {}
}
-});
-
-// Hacks to fix eager tag matching finishing too early: <script src="<% Foo.Bar %>"> => <script src="<% Foo.Bar %>
-if ( Prism.languages.aspnet.style ) {
- Prism.languages.aspnet.style.inside.tag.pattern = /<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i;
- Prism.languages.aspnet.style.inside.tag.inside = Prism.languages.aspnet.tag.inside;
-}
-if ( Prism.languages.aspnet.script ) {
- Prism.languages.aspnet.script.inside.tag.pattern = Prism.languages.aspnet['asp script'].inside.tag.pattern;
- Prism.languages.aspnet.script.inside.tag.inside = Prism.languages.aspnet.tag.inside;
-}
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/components/prism-aspnet.min.js b/components/prism-aspnet.min.js
index f315148..0afede5 100644
--- a/components/prism-aspnet.min.js
+++ b/components/prism-aspnet.min.js
@@ -1 +1 @@
-Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.aspnet.tag.pattern=/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/<script(?=.*runat=['"]?server['"]?)[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<\/?script\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,inside:Prism.languages.aspnet.tag.inside},rest:Prism.languages.csharp||{}}}}),Prism.languages.aspnet.style&&(Prism.languages.aspnet.style.inside.tag.pattern=/<\/?style\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/i,Prism.languages.aspnet.style.inside.tag.inside=Prism.languages.aspnet.tag.inside),Prism.languages.aspnet.script&&(Prism.languages.aspnet.script.inside.tag.pattern=Prism.languages.aspnet["asp script"].inside.tag.pattern,Prism.languages.aspnet.script.inside.tag.inside=Prism.languages.aspnet.tag.inside);
\ No newline at end of file
+Prism.languages.aspnet=Prism.languages.extend("markup",{"page-directive tag":{pattern:/<%\s*@.*%>/i,inside:{"page-directive tag":/<%\s*@\s*(?:Assembly|Control|Implements|Import|Master(?:Type)?|OutputCache|Page|PreviousPageType|Reference|Register)?|%>/i,rest:Prism.languages.markup.tag.inside}},"directive tag":{pattern:/<%.*%>/i,inside:{"directive tag":/<%\s*?[$=%#:]{0,2}|%>/i,rest:Prism.languages.csharp}}}),Prism.languages.aspnet.tag.pattern=/<(?!%)\/?[^\s>\/]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,Prism.languages.insertBefore("inside","punctuation",{"directive tag":Prism.languages.aspnet["directive tag"]},Prism.languages.aspnet.tag.inside["attr-value"]),Prism.languages.insertBefore("aspnet","comment",{"asp comment":/<%--[\w\W]*?--%>/}),Prism.languages.insertBefore("aspnet",Prism.languages.javascript?"script":"tag",{"asp script":{pattern:/(<script(?=.*runat=['"]?server['"]?)[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.csharp||{}}});
\ No newline at end of file
diff --git a/components/prism-css.js b/components/prism-css.js
index 05af658..3b219a9 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -21,14 +21,9 @@ Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
'style': {
- pattern: /<style[\w\W]*?>[\w\W]*?<\/style>/i,
- inside: {
- 'tag': {
- pattern: /<style[\w\W]*?>|<\/style>/i,
- inside: Prism.languages.markup.tag.inside
- },
- rest: Prism.languages.css
- },
+ pattern: /(<style[\w\W]*?>)[\w\W]*?(?=<\/style>)/i,
+ lookbehind: true,
+ inside: Prism.languages.css,
alias: 'language-css'
}
});
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index da88a59..5d8be07 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<style[\w\W]*?>)[\w\W]*?(?=<\/style>)/i,lookbehind:!0,inside:Prism.languages.css,alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
index 0d81394..1c75a76 100644
--- a/components/prism-javascript.js
+++ b/components/prism-javascript.js
@@ -34,14 +34,9 @@ Prism.languages.insertBefore('javascript', 'class-name', {
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
'script': {
- pattern: /<script[\w\W]*?>[\w\W]*?<\/script>/i,
- inside: {
- 'tag': {
- pattern: /<script[\w\W]*?>|<\/script>/i,
- inside: Prism.languages.markup.tag.inside
- },
- rest: Prism.languages.javascript
- },
+ pattern: /(<script[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,
+ lookbehind: true,
+ inside: Prism.languages.javascript,
alias: 'language-javascript'
}
});
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
index 617a028..c0a924b 100644
--- a/components/prism-javascript.min.js
+++ b/components/prism-javascript.min.js
@@ -1 +1 @@
-Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript},alias:"language-javascript"}}),Prism.languages.js=Prism.languages.javascript;
\ No newline at end of file
+Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<script[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.javascript,alias:"language-javascript"}}),Prism.languages.js=Prism.languages.javascript;
\ No newline at end of file
diff --git a/prism.js b/prism.js
index f1df177..f575db3 100644
--- a/prism.js
+++ b/prism.js
@@ -518,14 +518,9 @@ Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
'style': {
- pattern: /<style[\w\W]*?>[\w\W]*?<\/style>/i,
- inside: {
- 'tag': {
- pattern: /<style[\w\W]*?>|<\/style>/i,
- inside: Prism.languages.markup.tag.inside
- },
- rest: Prism.languages.css
- },
+ pattern: /(<style[\w\W]*?>)[\w\W]*?(?=<\/style>)/i,
+ lookbehind: true,
+ inside: Prism.languages.css,
alias: 'language-css'
}
});
@@ -621,14 +616,9 @@ Prism.languages.insertBefore('javascript', 'class-name', {
if (Prism.languages.markup) {
Prism.languages.insertBefore('markup', 'tag', {
'script': {
- pattern: /<script[\w\W]*?>[\w\W]*?<\/script>/i,
- inside: {
- 'tag': {
- pattern: /<script[\w\W]*?>|<\/script>/i,
- inside: Prism.languages.markup.tag.inside
- },
- rest: Prism.languages.javascript
- },
+ pattern: /(<script[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,
+ lookbehind: true,
+ inside: Prism.languages.javascript,
alias: 'language-javascript'
}
});
diff --git a/tests/languages/markup!+css/css_inclusion.test b/tests/languages/markup!+css/css_inclusion.test
index b606f11..6296fce 100644
--- a/tests/languages/markup!+css/css_inclusion.test
+++ b/tests/languages/markup!+css/css_inclusion.test
@@ -9,37 +9,37 @@ foo {
----------------------------------------------------
[
- ["style", [
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "<"],
- "style"
- ]],
- ["attr-name", [
- "type"
- ]],
- ["attr-value", [
- ["punctuation", "="],
- ["punctuation", "\""],
- "text/css",
- ["punctuation", "\""]
- ]],
- ["punctuation", ">"]
+ ["punctuation", "<"],
+ "style"
]],
+ ["attr-name", [
+ "type"
+ ]],
+ ["attr-value", [
+ ["punctuation", "="],
+ ["punctuation", "\""],
+ "text/css",
+ ["punctuation", "\""]
+ ]],
+ ["punctuation", ">"]
+ ]],
+ ["style", [
["selector", "foo"],
["punctuation", "{"],
["property", "bar"],
["punctuation", ":"],
" baz",
["punctuation", ";"],
- ["punctuation", "}"],
+ ["punctuation", "}"]
+ ]],
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "</"],
- "style"
- ]],
- ["punctuation", ">"]
- ]]
+ ["punctuation", "</"],
+ "style"
+ ]],
+ ["punctuation", ">"]
]],
["tag", [
diff --git a/tests/languages/markup!+javascript/javascript_inclusion.test b/tests/languages/markup!+javascript/javascript_inclusion.test
index 0aeeb0e..ef9a0ce 100644
--- a/tests/languages/markup!+javascript/javascript_inclusion.test
+++ b/tests/languages/markup!+javascript/javascript_inclusion.test
@@ -6,51 +6,53 @@
----------------------------------------------------
[
- ["script", [
+
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "<"],
- "script"
- ]],
- ["attr-name", [
- "type"
- ]],
- ["attr-value", [
- ["punctuation", "="],
- ["punctuation", "\""],
- "text/javascript",
- ["punctuation", "\""]
- ]],
- ["punctuation", ">"]
+ ["punctuation", "<"],
+ "script"
+ ]],
+ ["attr-name", [
+ "type"
+ ]],
+ ["attr-value", [
+ ["punctuation", "="],
+ ["punctuation", "\""],
+ "text/javascript",
+ ["punctuation", "\""]
]],
+ ["punctuation", ">"]
+ ]],
+ ["script", [
["function", "foo"],
["punctuation", "("],
- ["punctuation", ")"],
+ ["punctuation", ")"]
+ ]],
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "</"],
- "script"
- ]],
- ["punctuation", ">"]
- ]]
+ ["punctuation", "</"],
+ "script"
+ ]],
+ ["punctuation", ">"]
]],
- ["script", [
+
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "<"],
- "script"
- ]],
- ["punctuation", ">"]
+ ["punctuation", "<"],
+ "script"
]],
- ["string", "\"foo bar\""],
+ ["punctuation", ">"]
+ ]],
+ ["script", [
+ ["string", "\"foo bar\""]
+ ]],
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "</"],
- "script"
- ]],
- ["punctuation", ">"]
- ]]
- ]]
+ ["punctuation", "</"],
+ "script"
+ ]],
+ ["punctuation", ">"]
+ ]]
]
----------------------------------------------------
diff --git a/tests/languages/markup+javascript+csharp+aspnet/script_feature.test b/tests/languages/markup+javascript+csharp+aspnet/script_feature.test
index 80c1ef8..2be50eb 100644
--- a/tests/languages/markup+javascript+csharp+aspnet/script_feature.test
+++ b/tests/languages/markup+javascript+csharp+aspnet/script_feature.test
@@ -4,48 +4,49 @@
----------------------------------------------------
[
+ ["tag", [
+ ["tag", [
+ ["punctuation", "<"],
+ "script"
+ ]],
+ ["attr-name", [
+ "runat"
+ ]],
+ ["attr-value", [
+ ["punctuation", "="],
+ ["punctuation", "\""],
+ "server",
+ ["punctuation", "\""]
+ ]],
+ ["punctuation", ">"]
+ ]],
["asp script", [
+ ["preprocessor", "#foo"]
+ ]],
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "<"],
- "script"
- ]],
- ["attr-name", [
- "runat"
- ]],
- ["attr-value", [
- ["punctuation", "="],
- ["punctuation", "\""],
- "server",
- ["punctuation", "\""]
- ]],
- ["punctuation", ">"]
+ ["punctuation", "</"],
+ "script"
]],
- ["preprocessor", "#foo"],
+ ["punctuation", ">"]
+ ]],
+
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "</"],
- "script"
- ]],
- ["punctuation", ">"]
- ]]
+ ["punctuation", "<"],
+ "script"
+ ]],
+ ["punctuation", ">"]
]],
["script", [
+ ["regex", "/foo/"]
+ ]],
+ ["tag", [
["tag", [
- ["tag", [
- ["punctuation", "<"],
- "script"
- ]],
- ["punctuation", ">"]
+ ["punctuation", "</"],
+ "script"
]],
- ["regex", "/foo/"],
- ["tag", [
- ["tag", [
- ["punctuation", "</"],
- "script"
- ]],
- ["punctuation", ">"]
- ]]
+ ["punctuation", ">"]
]]
]