-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CSS: Selectors can contain any string (#1638)
This fixes that certain attribute value strings break the selector pattern.
- Loading branch information
1 parent
878ef29
commit a2d445d
Showing
4 changed files
with
109 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,51 @@ | ||
| Prism.languages.css = { | ||
| 'comment': /\/\*[\s\S]*?\*\//, | ||
| 'atrule': { | ||
| pattern: /@[\w-]+?[\s\S]*?(?:;|(?=\s*\{))/i, | ||
| inside: { | ||
| 'rule': /@[\w-]+/ | ||
| // See rest below | ||
| } | ||
| }, | ||
| 'url': /url\((?:(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1|.*?)\)/i, | ||
| 'selector': /[^{}\s][^{};]*?(?=\s*\{)/, | ||
| 'string': { | ||
| pattern: /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/, | ||
| greedy: true | ||
| }, | ||
| 'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i, | ||
| 'important': /!important\b/i, | ||
| 'function': /[-a-z0-9]+(?=\()/i, | ||
| 'punctuation': /[(){};:,]/ | ||
| }; | ||
| (function (Prism) { | ||
|
|
||
| Prism.languages.css['atrule'].inside.rest = Prism.languages.css; | ||
| var string = /("|')(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/; | ||
|
|
||
| if (Prism.languages.markup) { | ||
| Prism.languages.markup.tag.addInlined('style', 'css'); | ||
|
|
||
| Prism.languages.insertBefore('inside', 'attr-value', { | ||
| 'style-attr': { | ||
| pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i, | ||
| Prism.languages.css = { | ||
| 'comment': /\/\*[\s\S]*?\*\//, | ||
| 'atrule': { | ||
| pattern: /@[\w-]+?[\s\S]*?(?:;|(?=\s*\{))/i, | ||
| inside: { | ||
| 'attr-name': { | ||
| pattern: /^\s*style/i, | ||
| inside: Prism.languages.markup.tag.inside | ||
| 'rule': /@[\w-]+/ | ||
| // See rest below | ||
| } | ||
| }, | ||
| 'url': RegExp('url\\((?:' + string.source + '|.*?)\\)', 'i'), | ||
| 'selector': RegExp('[^{}\\s](?:[^{};"\']|' + string.source + ')*?(?=\\s*\\{)'), | ||
| 'string': { | ||
| pattern: string, | ||
| greedy: true | ||
| }, | ||
| 'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i, | ||
| 'important': /!important\b/i, | ||
| 'function': /[-a-z0-9]+(?=\()/i, | ||
| 'punctuation': /[(){};:,]/ | ||
| }; | ||
|
|
||
| Prism.languages.css['atrule'].inside.rest = Prism.languages.css; | ||
|
|
||
| var markup = Prism.languages.markup; | ||
| if (markup) { | ||
| markup.tag.addInlined('style', 'css'); | ||
|
|
||
| Prism.languages.insertBefore('inside', 'attr-value', { | ||
| 'style-attr': { | ||
| pattern: /\s*style=("|')(?:\\[\s\S]|(?!\1)[^\\])*\1/i, | ||
| inside: { | ||
| 'attr-name': { | ||
| pattern: /^\s*style/i, | ||
| inside: markup.tag.inside | ||
| }, | ||
| 'punctuation': /^\s*=\s*['"]|['"]\s*$/, | ||
| 'attr-value': { | ||
| pattern: /.+/i, | ||
| inside: Prism.languages.css | ||
| } | ||
| }, | ||
| 'punctuation': /^\s*=\s*['"]|['"]\s*$/, | ||
| 'attr-value': { | ||
| pattern: /.+/i, | ||
| inside: Prism.languages.css | ||
| } | ||
| }, | ||
| alias: 'language-css' | ||
| } | ||
| }, Prism.languages.markup.tag); | ||
| } | ||
| alias: 'language-css' | ||
| } | ||
| }, markup.tag); | ||
| } | ||
|
|
||
| }(Prism)); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,38 @@ | ||
| foo{ | ||
|
|
||
| foo + bar { | ||
|
|
||
| foo:first-child:hover { | ||
|
|
||
| * { | ||
|
|
||
| foo, | ||
| bar{ | ||
|
|
||
| [foo="{\"}"] { | ||
|
|
||
| ---------------------------------------------------- | ||
|
|
||
| [ | ||
| ["selector", "foo"], | ||
| ["punctuation", "{"], | ||
|
|
||
| ["selector", "foo + bar"], | ||
| ["punctuation", "{"], | ||
|
|
||
| ["selector", "foo:first-child:hover"], | ||
| ["punctuation", "{"], | ||
|
|
||
| ["selector", "*"], | ||
| ["punctuation", "{"], | ||
|
|
||
| ["selector", "foo,\r\nbar"], | ||
| ["punctuation", "{"], | ||
|
|
||
| ["selector", "[foo=\"{\\\"}\"]"], | ||
| ["punctuation", "{"] | ||
| ] | ||
|
|
||
| ---------------------------------------------------- | ||
|
|
||
| Checks for single-line and multi-line selectors. | ||
| Checks for single-line and multi-line selectors. |