Commit 0390e64420f090299b7bf62e65fecccd473d3ef5
2021-12-07T18:07:29
Pug: Improved filter tokenization (#3258) Co-authored-by: Jason Kurian <JaKXz@users.noreply.github.com>
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
diff --git a/components/prism-pug.js b/components/prism-pug.js
index aa9d769..0afee3f 100644
--- a/components/prism-pug.js
+++ b/components/prism-pug.js
@@ -33,7 +33,8 @@
'filter-name': {
pattern: /^:[\w-]+/,
alias: 'variable'
- }
+ },
+ 'text': /\S[\s\S]*/,
}
},
@@ -172,7 +173,11 @@
pattern: /^:[\w-]+/,
alias: 'variable'
},
- rest: Prism.languages[filter.language]
+ 'text': {
+ pattern: /\S[\s\S]*/,
+ alias: [filter.language, 'language-' + filter.language],
+ inside: Prism.languages[filter.language]
+ }
}
};
}
diff --git a/components/prism-pug.min.js b/components/prism-pug.min.js
index 2e3939d..4f2d778 100644
--- a/components/prism-pug.min.js
+++ b/components/prism-pug.min.js
@@ -1 +1 @@
-!function(e){e.languages.pug={comment:{pattern:/(^([\t ]*))\/\/.*(?:(?:\r?\n|\r)\2[\t ].+)*/m,lookbehind:!0},"multiline-script":{pattern:/(^([\t ]*)script\b.*\.[\t ]*)(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:e.languages.javascript},filter:{pattern:/(^([\t ]*)):.+(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"}}},"multiline-plain-text":{pattern:/(^([\t ]*)[\w\-#.]+\.[\t ]*)(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0},markup:{pattern:/(^[\t ]*)<.+/m,lookbehind:!0,inside:e.languages.markup},doctype:{pattern:/((?:^|\n)[\t ]*)doctype(?: .+)?/,lookbehind:!0},"flow-control":{pattern:/(^[\t ]*)(?:case|default|each|else|if|unless|when|while)\b(?: .+)?/m,lookbehind:!0,inside:{each:{pattern:/^each .+? in\b/,inside:{keyword:/\b(?:each|in)\b/,punctuation:/,/}},branch:{pattern:/^(?:case|default|else|if|unless|when|while)\b/,alias:"keyword"},rest:e.languages.javascript}},keyword:{pattern:/(^[\t ]*)(?:append|block|extends|include|prepend)\b.+/m,lookbehind:!0},mixin:[{pattern:/(^[\t ]*)mixin .+/m,lookbehind:!0,inside:{keyword:/^mixin/,function:/\w+(?=\s*\(|\s*$)/,punctuation:/[(),.]/}},{pattern:/(^[\t ]*)\+.+/m,lookbehind:!0,inside:{name:{pattern:/^\+\w+/,alias:"function"},rest:e.languages.javascript}}],script:{pattern:/(^[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*[\t ]).+/m,lookbehind:!0,inside:e.languages.javascript},"plain-text":{pattern:/(^[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]).+/m,lookbehind:!0},tag:{pattern:/(^[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/m,lookbehind:!0,inside:{attributes:[{pattern:/&[^(]+\([^)]+\)/,inside:e.languages.javascript},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*(?!\s))(?:\{[^}]*\}|[^,)\r\n]+)/,lookbehind:!0,inside:e.languages.javascript},"attr-name":/[\w-]+(?=\s*!?=|\s*[,)])/,punctuation:/[!=(),]+/}}],punctuation:/:/,"attr-id":/#[\w\-]+/,"attr-class":/\.[\w\-]+/}},code:[{pattern:/(^[\t ]*(?:-|!?=)).+/m,lookbehind:!0,inside:e.languages.javascript}],punctuation:/[.\-!=|]+/};for(var t=[{filter:"atpl",language:"twig"},{filter:"coffee",language:"coffeescript"},"ejs","handlebars","less","livescript","markdown",{filter:"sass",language:"scss"},"stylus"],n={},a=0,i=t.length;a<i;a++){var r=t[a];r="string"==typeof r?{filter:r,language:r}:r,e.languages[r.language]&&(n["filter-"+r.filter]={pattern:RegExp("(^([\t ]*)):<filter_name>(?:(?:\r?\n|\r(?!\n))(?:\\2[\t ].+|\\s*?(?=\r?\n|\r)))+".replace("<filter_name>",function(){return r.filter}),"m"),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},rest:e.languages[r.language]}})}e.languages.insertBefore("pug","filter",n)}(Prism);
\ No newline at end of file
+!function(e){e.languages.pug={comment:{pattern:/(^([\t ]*))\/\/.*(?:(?:\r?\n|\r)\2[\t ].+)*/m,lookbehind:!0},"multiline-script":{pattern:/(^([\t ]*)script\b.*\.[\t ]*)(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:e.languages.javascript},filter:{pattern:/(^([\t ]*)):.+(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},text:/\S[\s\S]*/}},"multiline-plain-text":{pattern:/(^([\t ]*)[\w\-#.]+\.[\t ]*)(?:(?:\r?\n|\r(?!\n))(?:\2[\t ].+|\s*?(?=\r?\n|\r)))+/m,lookbehind:!0},markup:{pattern:/(^[\t ]*)<.+/m,lookbehind:!0,inside:e.languages.markup},doctype:{pattern:/((?:^|\n)[\t ]*)doctype(?: .+)?/,lookbehind:!0},"flow-control":{pattern:/(^[\t ]*)(?:case|default|each|else|if|unless|when|while)\b(?: .+)?/m,lookbehind:!0,inside:{each:{pattern:/^each .+? in\b/,inside:{keyword:/\b(?:each|in)\b/,punctuation:/,/}},branch:{pattern:/^(?:case|default|else|if|unless|when|while)\b/,alias:"keyword"},rest:e.languages.javascript}},keyword:{pattern:/(^[\t ]*)(?:append|block|extends|include|prepend)\b.+/m,lookbehind:!0},mixin:[{pattern:/(^[\t ]*)mixin .+/m,lookbehind:!0,inside:{keyword:/^mixin/,function:/\w+(?=\s*\(|\s*$)/,punctuation:/[(),.]/}},{pattern:/(^[\t ]*)\+.+/m,lookbehind:!0,inside:{name:{pattern:/^\+\w+/,alias:"function"},rest:e.languages.javascript}}],script:{pattern:/(^[\t ]*script(?:(?:&[^(]+)?\([^)]+\))*[\t ]).+/m,lookbehind:!0,inside:e.languages.javascript},"plain-text":{pattern:/(^[\t ]*(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?[\t ]).+/m,lookbehind:!0},tag:{pattern:/(^[\t ]*)(?!-)[\w\-#.]*[\w\-](?:(?:&[^(]+)?\([^)]+\))*\/?:?/m,lookbehind:!0,inside:{attributes:[{pattern:/&[^(]+\([^)]+\)/,inside:e.languages.javascript},{pattern:/\([^)]+\)/,inside:{"attr-value":{pattern:/(=\s*(?!\s))(?:\{[^}]*\}|[^,)\r\n]+)/,lookbehind:!0,inside:e.languages.javascript},"attr-name":/[\w-]+(?=\s*!?=|\s*[,)])/,punctuation:/[!=(),]+/}}],punctuation:/:/,"attr-id":/#[\w\-]+/,"attr-class":/\.[\w\-]+/}},code:[{pattern:/(^[\t ]*(?:-|!?=)).+/m,lookbehind:!0,inside:e.languages.javascript}],punctuation:/[.\-!=|]+/};for(var t=[{filter:"atpl",language:"twig"},{filter:"coffee",language:"coffeescript"},"ejs","handlebars","less","livescript","markdown",{filter:"sass",language:"scss"},"stylus"],n={},a=0,i=t.length;a<i;a++){var r=t[a];r="string"==typeof r?{filter:r,language:r}:r,e.languages[r.language]&&(n["filter-"+r.filter]={pattern:RegExp("(^([\t ]*)):<filter_name>(?:(?:\r?\n|\r(?!\n))(?:\\2[\t ].+|\\s*?(?=\r?\n|\r)))+".replace("<filter_name>",function(){return r.filter}),"m"),lookbehind:!0,inside:{"filter-name":{pattern:/^:[\w-]+/,alias:"variable"},text:{pattern:/\S[\s\S]*/,alias:[r.language,"language-"+r.language],inside:e.languages[r.language]}}})}e.languages.insertBefore("pug","filter",n)}(Prism);
\ No newline at end of file
diff --git a/tests/languages/coffeescript+pug/coffeescript_inclusion.test b/tests/languages/coffeescript+pug/coffeescript_inclusion.test
index ccf8963..0ae21dc 100644
--- a/tests/languages/coffeescript+pug/coffeescript_inclusion.test
+++ b/tests/languages/coffeescript+pug/coffeescript_inclusion.test
@@ -6,14 +6,16 @@
[
["filter-coffee", [
["filter-name", ":coffee"],
- ["string", [
- "\"",
- ["interpolation", "#{foo}"],
- "\""
+ ["text", [
+ ["string", [
+ "\"",
+ ["interpolation", "#{foo}"],
+ "\""
+ ]]
]]
]]
]
----------------------------------------------------
-Checks for coffee filter (CoffeeScript) in Jade.
\ No newline at end of file
+Checks for coffee filter (CoffeeScript) in pug.
diff --git a/tests/languages/ejs+pug/ejs_inclusion.test b/tests/languages/ejs+pug/ejs_inclusion.test
index bbd9452..f5b90b1 100644
--- a/tests/languages/ejs+pug/ejs_inclusion.test
+++ b/tests/languages/ejs+pug/ejs_inclusion.test
@@ -6,19 +6,20 @@
[
["filter-ejs", [
["filter-name", ":ejs"],
- ["language-javascript", [
- ["operator", "<"],
- ["operator", "%"],
- ["keyword", "var"],
- " foo ",
- ["operator", "="],
- ["string", "''"],
- ["punctuation", ","],
- " bar ",
- ["operator", "="],
- ["boolean", "false"],
- ["punctuation", ";"]
- ]],
- ["delimiter", "%>"]
+ ["text", [
+ ["delimiter", "<%"],
+ ["language-javascript", [
+ ["keyword", "var"],
+ " foo ",
+ ["operator", "="],
+ ["string", "''"],
+ ["punctuation", ","],
+ " bar ",
+ ["operator", "="],
+ ["boolean", "false"],
+ ["punctuation", ";"]
+ ]],
+ ["delimiter", "%>"]
+ ]]
]]
]
diff --git a/tests/languages/handlebars+pug/handlebars_inclusion.test b/tests/languages/handlebars+pug/handlebars_inclusion.test
index c69751f..156cf8a 100644
--- a/tests/languages/handlebars+pug/handlebars_inclusion.test
+++ b/tests/languages/handlebars+pug/handlebars_inclusion.test
@@ -6,10 +6,12 @@
[
["filter-handlebars", [
["filter-name", ":handlebars"],
- ["comment", "{{!comment}}"]
+ ["text", [
+ ["comment", "{{!comment}}"]
+ ]]
]]
]
----------------------------------------------------
-Checks for handlebars filter in Jade.
\ No newline at end of file
+Checks for handlebars filter in pug.
diff --git a/tests/languages/less+pug/less_inclusion.test b/tests/languages/less+pug/less_inclusion.test
index 1cc8b35..ccd5f6a 100644
--- a/tests/languages/less+pug/less_inclusion.test
+++ b/tests/languages/less+pug/less_inclusion.test
@@ -6,15 +6,17 @@
[
["filter-less", [
["filter-name", ":less"],
- ["variable", [
- "@foo",
- ["punctuation", ":"]
- ]],
- " #123",
- ["punctuation", ";"]
+ ["text", [
+ ["variable", [
+ "@foo",
+ ["punctuation", ":"]
+ ]],
+ " #123",
+ ["punctuation", ";"]
+ ]]
]]
]
----------------------------------------------------
-Checks for less filter in Jade.
\ No newline at end of file
+Checks for less filter in pug.
diff --git a/tests/languages/livescript+pug/livescript_inclusion.test b/tests/languages/livescript+pug/livescript_inclusion.test
index ae2c878..cc9bafe 100644
--- a/tests/languages/livescript+pug/livescript_inclusion.test
+++ b/tests/languages/livescript+pug/livescript_inclusion.test
@@ -6,23 +6,25 @@
[
["filter-livescript", [
["filter-name", ":livescript"],
- ["interpolated-string", [
- ["string", "\""],
- ["variable", "#foo"],
- ["string", " "],
- ["interpolation", [
- ["interpolation-punctuation", "#{"],
- ["keyword", "if"],
- ["regex", "/test/"],
- ["operator", "=="],
- ["string", "'test'"],
- ["keyword", "then"],
- ["number", "3"],
- ["keyword", "else"],
- ["number", "4"],
- ["interpolation-punctuation", "}"]
- ]],
- ["string", "\""]
+ ["text", [
+ ["interpolated-string", [
+ ["string", "\""],
+ ["variable", "#foo"],
+ ["string", " "],
+ ["interpolation", [
+ ["interpolation-punctuation", "#{"],
+ ["keyword", "if"],
+ ["regex", "/test/"],
+ ["operator", "=="],
+ ["string", "'test'"],
+ ["keyword", "then"],
+ ["number", "3"],
+ ["keyword", "else"],
+ ["number", "4"],
+ ["interpolation-punctuation", "}"]
+ ]],
+ ["string", "\""]
+ ]]
]]
]]
]
diff --git a/tests/languages/markdown+pug/markdown_inclusion.test b/tests/languages/markdown+pug/markdown_inclusion.test
index 01e6c3e..cd3fb26 100644
--- a/tests/languages/markdown+pug/markdown_inclusion.test
+++ b/tests/languages/markdown+pug/markdown_inclusion.test
@@ -6,13 +6,15 @@
[
["filter-markdown", [
["filter-name", ":markdown"],
- ["title", [
- ["punctuation", "#"],
- " title"
+ ["text", [
+ ["title", [
+ ["punctuation", "#"],
+ " title"
+ ]]
]]
]]
]
----------------------------------------------------
-Checks for markdown filter in Jade.
\ No newline at end of file
+Checks for markdown filter in pug.
diff --git a/tests/languages/pug/filter_feature.test b/tests/languages/pug/filter_feature.test
index 0e23802..f055e20 100644
--- a/tests/languages/pug/filter_feature.test
+++ b/tests/languages/pug/filter_feature.test
@@ -6,6 +6,6 @@
[
["filter", [
["filter-name", ":language"],
- "\r\n\tcode"
+ ["text", "code"]
]]
]
diff --git a/tests/languages/scss+pug/scss_inclusion.test b/tests/languages/scss+pug/scss_inclusion.test
index 0351478..194355d 100644
--- a/tests/languages/scss+pug/scss_inclusion.test
+++ b/tests/languages/scss+pug/scss_inclusion.test
@@ -6,12 +6,14 @@
[
["filter-sass", [
["filter-name", ":sass"],
- ["keyword", "@extend"],
- " .foo",
- ["punctuation", ";"]
+ ["text", [
+ ["keyword", "@extend"],
+ " .foo",
+ ["punctuation", ";"]
+ ]]
]]
]
----------------------------------------------------
-Checks for sass filter (Scss) in Jade.
\ No newline at end of file
+Checks for sass filter (Scss) in pug.
diff --git a/tests/languages/stylus+pug/stylus_inclusion.test b/tests/languages/stylus+pug/stylus_inclusion.test
index d154ab2..b00906d 100644
--- a/tests/languages/stylus+pug/stylus_inclusion.test
+++ b/tests/languages/stylus+pug/stylus_inclusion.test
@@ -6,15 +6,17 @@
[
["filter-stylus", [
["filter-name", ":stylus"],
- ["variable-declaration", [
- ["variable", "font-size"],
- ["operator", "="],
- ["number", "14"],
- ["unit", "px"]
+ ["text", [
+ ["variable-declaration", [
+ ["variable", "font-size"],
+ ["operator", "="],
+ ["number", "14"],
+ ["unit", "px"]
+ ]]
]]
]]
]
----------------------------------------------------
-Checks for stylus filter in Jade.
\ No newline at end of file
+Checks for stylus filter in pug.
diff --git a/tests/languages/twig+pug/twig_inclusion.test b/tests/languages/twig+pug/twig_inclusion.test
index 3b84c61..8066230 100644
--- a/tests/languages/twig+pug/twig_inclusion.test
+++ b/tests/languages/twig+pug/twig_inclusion.test
@@ -6,14 +6,14 @@
[
["filter-atpl", [
["filter-name", ":atpl"],
-
- ["punctuation", "{"],
- ["punctuation", "{"],
- ["number", "42"],
- ["delimiter", "}}"]
+ ["text", [
+ ["delimiter", "{{"],
+ ["number", "42"],
+ ["delimiter", "}}"]
+ ]]
]]
]
----------------------------------------------------
-Checks for atpl filter (Twig) in Jade.
+Checks for atpl filter (Twig) in pug.