drop CompoundSelector customer

csstree · Jan 30, 2017 · 5cb04ed · 5cb04ed
1 parent a3ef27f
commit 5cb04ed
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 95 deletions.
diff --git a/lib/parser/index.js b/lib/parser/index.js
@@ -15,7 +15,6 @@ var getAtrule = require('./nodes/Atrule');
 var getRule = require('./nodes/Rule');
 var getSelectorList = require('./nodes/SelectorList');
 var getSelector = require('./nodes/Selector');
-var getCompoundSelector = require('./nodes/_CompoundSelector');
 var getBlock = require('./nodes/Block');
 var getDeclarationList = require('./nodes/DeclarationList');
 var getDeclaration = require('./nodes/Declaration');
@@ -122,7 +121,6 @@ Parser.prototype = {
     Rule: getRule,
     SelectorList: getSelectorList,
     Selector: getSelector,
-    CompoundSelector: getCompoundSelector,
     Block: getBlock,
     DeclarationList: getDeclarationList,
     Declaration: getDeclaration,
@@ -205,6 +203,6 @@ var parser = new Parser();
 
 // warm up parse to elimitate code branches that never execute
 // fix soft deoptimizations (insufficient type feedback)
-parser.parse('a.b#c:e:Not(a):Nth-child(2n+1)::g,* b >c+d~e/deep/f,100%{v:1 2em t a(2%, var(--a)) url(..) -foo-bar !important}');
+parser.parse('a.b#c:e:Not(a/**/):Nth-child(2n+1)::g::slotted(a/**/),* b >c+d~e/deep/f,100%{v:1 2em t a(2%, var(--a)) url(..) -foo-bar !important}');
 
 module.exports = parser.parse.bind(parser);
diff --git a/lib/parser/nodes/PseudoElement.js b/lib/parser/nodes/PseudoElement.js
@@ -4,6 +4,8 @@ var TYPE = require('../../scanner').TYPE;
 var COLON = TYPE.Colon;
 var LEFTPARENTHESIS = TYPE.LeftParenthesis;
 var RIGHTPARENTHESIS = TYPE.RightParenthesis;
+var ABSOLUTE = false;
+var DISALLOW_COMBINATORS = true;
 
 // :: ident
 module.exports = function PseudoElement() {
@@ -18,7 +20,7 @@ module.exports = function PseudoElement() {
     if (this.scanner.lookupValue(0, 'slotted')) {
         name = this.readIdent(false);
         this.scanner.eat(LEFTPARENTHESIS);
-        children = new List().appendData(this.CompoundSelector());
+        children = new List().appendData(this.Selector(ABSOLUTE, DISALLOW_COMBINATORS));
         this.scanner.eat(RIGHTPARENTHESIS);
     } else {
         name = this.readIdent(false);

diff --git a/lib/parser/nodes/Selector.js b/lib/parser/nodes/Selector.js
@@ -17,7 +17,7 @@ var LEFTSQUAREBRACKET = TYPE.LeftSquareBracket;
 var VERTICALLINE = TYPE.VerticalLine;
 var TILDE = TYPE.Tilde;
 
-module.exports = function Selector(relative) {
+module.exports = function Selector(relative, disallowCombinators) {
     this.readSC();
 
     var start = this.scanner.tokenStart;
@@ -27,14 +27,27 @@ module.exports = function Selector(relative) {
     var combinatorOffset = -1;
     var child = null;
 
+    relative = relative || false;
+    disallowCombinators = disallowCombinators || false;
+
     scan:
     while (!this.scanner.eof) {
         switch (this.scanner.tokenType) {
             case COMMENT:
+                if (disallowCombinators) {
+                    this.readSC();
+                    break scan;
+                }
+
                 this.scanner.next();
                 continue;
 
             case WHITESPACE:
+                if (disallowCombinators) {
+                    this.readSC();
+                    break scan;
+                }
+
                 if (combinator === null && children.head !== null) {
                     combinatorOffset = this.scanner.tokenStart;
                     combinator = DESCENDANT_COMBINATOR;
@@ -47,7 +60,8 @@ module.exports = function Selector(relative) {
             case GREATERTHANSIGN:
             case TILDE:
             case SOLIDUS:
-                if ((children.head === null && !relative) || // combinator in the beginning
+                if (disallowCombinators ||
+                    (children.head === null && !relative) || // combinator in the beginning
                     (combinator !== null && combinator !== DESCENDANT_COMBINATOR)) {
                     this.scanner.error('Unexpected combinator');
                 }

diff --git a/lib/parser/nodes/_CompoundSelector.js b/lib/parser/nodes/_CompoundSelector.js
diff --git a/test/fixture/parse/selector/pseudo-slotted.json b/test/fixture/parse/selector/pseudo-slotted.json
@@ -89,7 +89,7 @@
     "error #6": {
         "source": "::slotted(> test)",
         "offset": "          ^",
-        "error": "Selector is expected"
+        "error": "Unexpected combinator"
     },
     "error #7": {
         "source": "::slotted(foo,bar)",