CSS: Improve atrules

PrismJS · Jul 8, 2015 · e254088 · e254088
1 parent cd0273e
commit e254088
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/components/prism-css.js b/components/prism-css.js
@@ -3,7 +3,8 @@ Prism.languages.css = {
 	'atrule': {
 		pattern: /@[\w-]+?.*?(;|(?=\s*\{))/i,
 		inside: {
-			'punctuation': /[;:]/
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
@@ -15,6 +16,8 @@ Prism.languages.css = {
 	'punctuation': /[(){};:]/
 };
 
+Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css);
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'style': {

diff --git a/components/prism-css.min.js b/components/prism-css.min.js
diff --git a/components/prism-scss.js b/components/prism-scss.js
@@ -6,7 +6,8 @@ Prism.languages.scss = Prism.languages.extend('css', {
 	'atrule': {
 		pattern: /@[\w-]+(?:\([^()]+\)|[^(])*?(?=\s+(\{|;))/i,
 		inside: {
-			// See rest at the end of the file
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	// url, compassified

diff --git a/components/prism-scss.min.js b/components/prism-scss.min.js
diff --git a/prism.js b/prism.js
@@ -487,7 +487,8 @@ Prism.languages.css = {
 	'atrule': {
 		pattern: /@[\w-]+?.*?(;|(?=\s*\{))/i,
 		inside: {
-			'punctuation': /[;:]/
+			'rule': /@[\w-]+/
+			// See rest below
 		}
 	},
 	'url': /url\((?:(["'])(\\\n|\\?.)*?\1|.*?)\)/i,
@@ -499,6 +500,8 @@ Prism.languages.css = {
 	'punctuation': /[(){};:]/
 };
 
+Prism.languages.css['atrule'].inside.rest = Prism.util.clone(Prism.languages.css);
+
 if (Prism.languages.markup) {
 	Prism.languages.insertBefore('markup', 'tag', {
 		'style': {