CSS Extras: Optimized class and id patterns (#2359)

PrismJS · May 18, 2020 · fdbc447 · fdbc447
1 parent b526e8c
commit fdbc447
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 39 deletions.
diff --git a/components/prism-css-extras.js b/components/prism-css-extras.js
@@ -8,8 +8,8 @@
 		inside: selectorInside = {
 			'pseudo-element': /:(?:after|before|first-letter|first-line|selection)|::[-\w]+/,
 			'pseudo-class': /:[-\w]+/,
-			'class': /\.[-:.\w]+/,
-			'id': /#[-:.\w]+/,
+			'class': /\.[-\w]+/,
+			'id': /#[-\w]+/,
 			'attribute': {
 				pattern: RegExp('\\[(?:[^[\\]"\']|' + string.source + ')*\\]'),
 				greedy: true,

diff --git a/components/prism-css-extras.min.js b/components/prism-css-extras.min.js
diff --git a/tests/languages/css!+css-extras/selector_feature.test b/tests/languages/css!+css-extras/selector_feature.test
@@ -1,20 +1,12 @@
 foo:after {
 foo::first-letter {
 
-foo.bar {
+foo.bar.baz {
 
-foo#bar {
+foo#bar.baz {
 
 #foo > .bar:hover:after {
 
-span,
-div {
-
-div > p,
-.css-li ~ .css-li,
-.previous-selector + .selector,
-.selected || td {
-
 ----------------------------------------------------
 
 [
@@ -30,12 +22,14 @@ div > p,
 
 	["selector", [
 		"foo",
-		["class", ".bar"]
+		["class", ".bar"],
+		["class", ".baz"]
 	]], ["punctuation", "{"],
 
 	["selector", [
 		"foo",
-		["id", "#bar"]
+		["id", "#bar"],
+		["class", ".baz"]
 	]], ["punctuation", "{"],
 
 	["selector", [
@@ -44,30 +38,6 @@ div > p,
 		["class", ".bar"],
 		["pseudo-class", ":hover"],
 		["pseudo-element", ":after"]
-	]], ["punctuation", "{"],
-
-	["selector", [
-		"span",
-		["punctuation", ","],
-		"\r\ndiv"
-	]], ["punctuation", "{"],
-
-	["selector", [
-		"div ",
-		["combinator", ">"],
-		" p",
-		["punctuation", ","],
-		["class", ".css-li"],
-		["combinator", "~"],
-		["class", ".css-li"],
-		["punctuation", ","],
-		["class", ".previous-selector"],
-		["combinator", "+"],
-		["class", ".selector"],
-		["punctuation", ","],
-		["class", ".selected"],
-		["combinator", "||"],
-		" td"
 	]], ["punctuation", "{"]
 ]