CSS: Comma punctuation (#1632)

* Show invisibles inside tokens * Revert "Show invisibles inside tokens" This reverts commit 2d622f1. * Added the comma to the list of CSS punctuation
PrismJS · Dec 1, 2018 · 1b81238 · 1b81238
2 parents 39686e1 + c988936
commit 1b81238
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/components/prism-css.js b/components/prism-css.js
@@ -16,7 +16,7 @@ Prism.languages.css = {
 	'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
 	'important': /!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
-	'punctuation': /[(){};:]/
+	'punctuation': /[(){};:,]/
 };
 
 Prism.languages.css['atrule'].inside.rest = Prism.languages.css;

diff --git a/components/prism-css.min.js b/components/prism-css.min.js
diff --git a/components/prism-less.js b/components/prism-less.js
@@ -30,7 +30,6 @@ Prism.languages.less = Prism.languages.extend('css', {
 	},
 
 	'property': /(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,
-	'punctuation': /[{}();:,]/,
 	'operator': /[+\-*\/]/
 });
 

diff --git a/components/prism-less.min.js b/components/prism-less.min.js
diff --git a/prism.js b/prism.js
@@ -637,7 +637,7 @@ Prism.languages.css = {
 	'property': /[-_a-z\xA0-\uFFFF][-\w\xA0-\uFFFF]*(?=\s*:)/i,
 	'important': /!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
-	'punctuation': /[(){};:]/
+	'punctuation': /[(){};:,]/
 };
 
 Prism.languages.css['atrule'].inside.rest = Prism.languages.css;

diff --git a/tests/languages/css/function_feature.test b/tests/languages/css/function_feature.test
@@ -17,7 +17,13 @@ filter: opacity(alpha=0);
 	["punctuation", ":"],
 	["function", "rgba"],
 	["punctuation", "("],
-	"0, 0, 0, 0.2",
+	"0",
+	["punctuation", ","],
+	" 0",
+	["punctuation", ","],
+	" 0",
+	["punctuation", ","],
+	" 0.2",
 	["punctuation", ")"],
 	["punctuation", ";"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ Prism.languages.less = Prism.languages.extend('css', { @@
     	},
     	'property': /(?:@\{[\w-]+\}|[\w-])+(?:\+_?)?(?=\s*:)/i,
-    	'punctuation': /[{}();:,]/,
     	'operator': /[+\-*\/]/
     });
@@ Expand Down @@