Skip to content
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

Support single colon in css/scss/less/stylus when using pseudo elemen… #3358

Merged
merged 2 commits into from
Oct 13, 2021
Merged

Support single colon in css/scss/less/stylus when using pseudo elemen… #3358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3dc9d6
Support single colon in css/scss/less/stylus when using pseudo elemen…
Oct 12, 2021
f8013f7
Merge branch 'main' into bugfix/3240-pseudo-elements
joshgoebel Oct 13, 2021
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Grammars:
- enh(scala) add `using` soft keyword (#3330) [Nicolas Stucki][]
- enh(fsharp) added `f#` alias (#3337) [Bahnschrift][]
- enh(bash) added gnu core utilities (#3342) [katzeprior][]
- fix(css/less/stylus/scss) highlight single-colon psuedo-elements properly (#3240) [zsoltlengyelit][]

[Austin Schick]: https://github.com/austin-schick
[Josh Goebel]: https://github.com/joshgoebel
Expand All @@ -44,6 +45,7 @@ Grammars:
[Bahnschrift]: https://github.com/Bahnschrift
[Melvyn Laïly]: https://github.com/mlaily
[katzeprior]: https://github.com/katzeprior
[zsoltlengyelit]: github.com/zsoltlengyelit


## Version 11.2.0
Expand Down
2 changes: 1 addition & 1 deletion src/languages/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function(hljs) {
begin: ':(' + css.PSEUDO_CLASSES.join('|') + ')'
},
{
begin: '::(' + css.PSEUDO_ELEMENTS.join('|') + ')'
begin: ':(:)?(' + css.PSEUDO_ELEMENTS.join('|') + ')'
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion src/languages/less.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export default function(hljs) {
},
{
className: 'selector-pseudo',
begin: '::(' + css.PSEUDO_ELEMENTS.join('|') + ')'
begin: ':(:)?(' + css.PSEUDO_ELEMENTS.join('|') + ')'
},
{
begin: /\(/,
Expand Down
2 changes: 1 addition & 1 deletion src/languages/scss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function(hljs) {
},
{
className: 'selector-pseudo',
begin: '::(' + PSEUDO_ELEMENTS.join('|') + ')'
begin: ':(:)?(' + PSEUDO_ELEMENTS.join('|') + ')'
},
VARIABLE,
{ // pseudo-selector params
Expand Down
2 changes: 1 addition & 1 deletion src/languages/stylus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function(hljs) {
},
{
className: 'selector-pseudo',
begin: '&?::(' + css.PSEUDO_ELEMENTS.join('|') + ')' + LOOKAHEAD_TAG_END
begin: '&?:(:)?(' + css.PSEUDO_ELEMENTS.join('|') + ')' + LOOKAHEAD_TAG_END
},

modes.ATTRIBUTE_SELECTOR_MODE,
Expand Down
4 changes: 2 additions & 2 deletions test/markup/css/pseudo.expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span class="hljs-selector-class">.test</span>:before,
.test:after {
<span class="hljs-selector-class">.test</span><span class="hljs-selector-pseudo">:before</span>,
<span class="hljs-selector-class">.test</span><span class="hljs-selector-pseudo">:after</span> {
<span class="hljs-attribute">color</span>: pink;
<span class="hljs-attribute">color</span>: red;
}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/less/css_consistency.expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

<span class="hljs-selector-tag">a</span><span class="hljs-selector-pseudo">:visited</span> { <span class="hljs-attribute">color</span>: blue; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">span</span><span class="hljs-selector-pseudo">:nth-child</span>(<span class="hljs-number">33</span>) { <span class="hljs-attribute">color</span>:red; }

<span class="hljs-selector-tag">p</span><span class="hljs-selector-pseudo">:lang</span>(en) {}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/less/css_consistency.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ h1, h2, figcaption, aside, main, form, footer {}

a:visited { color: blue; }
div::after { content: "test"; }
div:after { content: "test"; }
div::before { content: open-quote; }
div:before { content: open-quote; }
span:nth-child(33) { color:red; }

p:lang(en) {}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/scss/css_consistency.expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

<span class="hljs-selector-tag">a</span><span class="hljs-selector-pseudo">:visited</span> { <span class="hljs-attribute">color</span>: blue; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">span</span><span class="hljs-selector-pseudo">:nth-child</span>(<span class="hljs-number">33</span>) { <span class="hljs-attribute">color</span>:red; }

<span class="hljs-selector-tag">p</span><span class="hljs-selector-pseudo">:lang</span>(en) {}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/scss/css_consistency.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ h1, h2, figcaption, aside, main, form, footer {}

a:visited { color: blue; }
div::after { content: "test"; }
div:after { content: "test"; }
div::before { content: open-quote; }
div:before { content: open-quote; }
span:nth-child(33) { color:red; }

p:lang(en) {}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/stylus/css_consistency.expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@

<span class="hljs-selector-tag">a</span><span class="hljs-selector-pseudo">:visited</span> { <span class="hljs-attribute">color</span>: blue; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:after</span> { <span class="hljs-attribute">content</span>: <span class="hljs-string">&quot;test&quot;</span>; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">::before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">div</span><span class="hljs-selector-pseudo">:before</span> { <span class="hljs-attribute">content</span>: open-quote; }
<span class="hljs-selector-tag">span</span><span class="hljs-selector-pseudo">:nth-child</span>(<span class="hljs-number">33</span>) { <span class="hljs-attribute">color</span>:red; }

<span class="hljs-selector-tag">p</span><span class="hljs-selector-pseudo">:lang</span>(en) {}
Expand Down
2 changes: 2 additions & 0 deletions test/markup/stylus/css_consistency.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ h1, h2, figcaption, aside, main, form, footer {}

a:visited { color: blue; }
div::after { content: "test"; }
div:after { content: "test"; }
div::before { content: open-quote; }
div:before { content: open-quote; }
span:nth-child(33) { color:red; }

p:lang(en) {}
Expand Down