Skip to content

Commit c60b7d4

Browse files
committed
SCSS: Regexp simplification
1 parent bd19b04 commit c60b7d4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

components/prism-scss.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ Prism.languages.scss = Prism.languages.extend('css', {
2121
// this one was hard to do, so please be careful if you edit this one :)
2222
'selector': {
2323
// Initial look-ahead is used to prevent matching of blank selectors
24-
pattern: /(?=\S)[^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,
24+
pattern: /(?=\S)[^@;{}()]?(?:[^@;{}()]|&|#\{\$[-\w]+\})+(?=\s*\{(?:\}|\s|[^}]+[:{][^}]+))/m,
2525
inside: {
2626
'parent': {
2727
pattern: /&/,
2828
alias: 'important'
2929
},
30-
'placeholder': /%[-_\w]+/,
31-
'variable': /\$[-_\w]+|#\{\$[-_\w]+\}/
30+
'placeholder': /%[-\w]+/,
31+
'variable': /\$[-\w]+|#\{\$[-\w]+\}/
3232
}
3333
}
3434
});
@@ -44,20 +44,20 @@ Prism.languages.insertBefore('scss', 'atrule', {
4444
});
4545

4646
Prism.languages.scss.property = {
47-
pattern: /(?:[\w-]|\$[-_\w]+|#\{\$[-_\w]+\})+(?=\s*:)/i,
47+
pattern: /(?:[\w-]|\$[-\w]+|#\{\$[-\w]+\})+(?=\s*:)/i,
4848
inside: {
49-
'variable': /\$[-_\w]+|#\{\$[-_\w]+\}/
49+
'variable': /\$[-\w]+|#\{\$[-\w]+\}/
5050
}
5151
};
5252

5353
Prism.languages.insertBefore('scss', 'important', {
5454
// var and interpolated vars
55-
'variable': /\$[-_\w]+|#\{\$[-_\w]+\}/
55+
'variable': /\$[-\w]+|#\{\$[-\w]+\}/
5656
});
5757

5858
Prism.languages.insertBefore('scss', 'function', {
5959
'placeholder': {
60-
pattern: /%[-_\w]+/,
60+
pattern: /%[-\w]+/,
6161
alias: 'selector'
6262
},
6363
'statement': {

components/prism-scss.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)