SCSS: Match placeholders inside selectors + alias other placeholders …

…as selectors (fix #238)
PrismJS · Jul 11, 2015 · 4e42e26 · 4e42e26
1 parent d4194c9
commit 4e42e26
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/components/prism-scss.js b/components/prism-scss.js
@@ -19,7 +19,12 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	// the end of a selector is found when there is no rules in it ( {} or {\s}) or if there is a property (because an interpolated var
 	// can "pass" as a selector- e.g: proper#{$erty})
 	// this one was ard to do, so please be careful if you edit this one :)
-	'selector': /([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m
+	'selector': {
+		pattern: /([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/m,
+		inside: {
+			'placeholder': /%[-_\w]+/i
+		}
+	}
 });
 
 Prism.languages.insertBefore('scss', 'atrule', {
@@ -32,7 +37,10 @@ Prism.languages.insertBefore('scss', 'property', {
 });
 
 Prism.languages.insertBefore('scss', 'function', {
-	'placeholder': /%[-_\w]+/i,
+	'placeholder': {
+		pattern: /%[-_\w]+/i,
+		alias: 'selector'
+	},
 	'statement': /\B!(default|optional)\b/i,
 	'boolean': /\b(true|false)\b/,
 	'null': /\b(null)\b/,

diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js