implement proper list handling/parsing

Author: shagkur

ph-css/src/main/java/com/helger/css/decl/CSSSelectorMemberPseudoHas.java

@@ -26,7 +26,6 @@
 import com.helger.commons.annotation.ReturnsMutableCopy;
 import com.helger.commons.collection.impl.CommonsArrayList;
 import com.helger.commons.collection.impl.ICommonsList;
-import com.helger.commons.equals.EqualsHelper;
 import com.helger.commons.hashcode.HashCodeGenerator;
 import com.helger.commons.state.EChange;
 import com.helger.commons.string.ToStringGenerator;
@@ -46,40 +45,27 @@
 @NotThreadSafe
 public class CSSSelectorMemberPseudoHas implements ICSSSelectorMember, ICSSVersionAware, ICSSSourceLocationAware
 {
-  private final ECSSSelectorCombinator m_eCombinator;
   private final ICommonsList <CSSSelector> m_aNestedSelectors;
   private CSSSourceLocation m_aSourceLocation;
 
-  public CSSSelectorMemberPseudoHas (@Nullable final ECSSSelectorCombinator eCombinator,
-                                     @Nonnull final CSSSelector aNestedSelector)
+  public CSSSelectorMemberPseudoHas (@Nonnull final CSSSelector aNestedSelector)
   {
     ValueEnforcer.notNull (aNestedSelector, "NestedSelector");
-    m_eCombinator = eCombinator;
     m_aNestedSelectors = new CommonsArrayList <> (aNestedSelector);
   }
 
-  public CSSSelectorMemberPseudoHas (@Nullable final ECSSSelectorCombinator eCombinator,
-                                     @Nonnull final CSSSelector... aNestedSelectors)
+  public CSSSelectorMemberPseudoHas (@Nonnull final CSSSelector... aNestedSelectors)
   {
     ValueEnforcer.notNull (aNestedSelectors, "NestedSelectors");
-    m_eCombinator = eCombinator;
     m_aNestedSelectors = new CommonsArrayList <> (aNestedSelectors);
   }
 
-  public CSSSelectorMemberPseudoHas (@Nullable final ECSSSelectorCombinator eCombinator,
-                                     @Nonnull final Iterable <CSSSelector> aNestedSelectors)
+  public CSSSelectorMemberPseudoHas (@Nonnull final Iterable <CSSSelector> aNestedSelectors)
   {
     ValueEnforcer.notNull (aNestedSelectors, "NestedSelectors");
-    m_eCombinator = eCombinator;
     m_aNestedSelectors = new CommonsArrayList <> (aNestedSelectors);
   }
 
-  @Nullable
-  public ECSSSelectorCombinator getCombinator ()
-  {
-    return m_eCombinator;
-  }
-
   public boolean hasSelectors ()
   {
     return m_aNestedSelectors.isNotEmpty ();
@@ -177,10 +163,6 @@ public String getAsCSSString (@Nonnull final ICSSWriterSettings aSettings, @Nonn
 
     final boolean bOptimizedOutput = aSettings.isOptimizedOutput ();
     final StringBuilder aSB = new StringBuilder (":has(");
-
-    if (m_eCombinator != null)
-      aSB.append (m_eCombinator.getAsCSSString (aSettings));
-
     boolean bFirst = true;
     for (final CSSSelector aNestedSelector : m_aNestedSelectors)
     {
@@ -218,20 +200,19 @@ public boolean equals (final Object o)
     if (o == null || !getClass ().equals (o.getClass ()))
       return false;
     final CSSSelectorMemberPseudoHas rhs = (CSSSelectorMemberPseudoHas) o;
-    return EqualsHelper.equals (m_eCombinator, rhs.m_eCombinator) && m_aNestedSelectors.equals (rhs.m_aNestedSelectors);
+    return m_aNestedSelectors.equals (rhs.m_aNestedSelectors);
   }
 
   @Override
   public int hashCode ()
   {
-    return new HashCodeGenerator (this).append (m_eCombinator).append (m_aNestedSelectors).getHashCode ();
+    return new HashCodeGenerator (this).append (m_aNestedSelectors).getHashCode ();
   }
 
   @Override
   public String toString ()
   {
-    return new ToStringGenerator (null).append ("Combinator", m_eCombinator)
-                                       .append ("NestedSelectors", m_aNestedSelectors)
+    return new ToStringGenerator (null).append ("NestedSelectors", m_aNestedSelectors)
                                        .appendIfNotNull ("SourceLocation", m_aSourceLocation)
                                        .getToString ();
   }

ph-css/src/main/java/com/helger/css/handler/CSSNodeToDomainObject.java

@@ -321,30 +321,12 @@ private ICSSSelectorMember _createSelectorMember (final CSSNode aNode)
 
         if (ECSSNodeType.PSEUDO_HAS.isNode (aChildNode, m_eVersion))
         {
-          ECSSSelectorCombinator eSelectorCombinator = null;
-
           final int nChildChildCount = aChildNode.jjtGetNumChildren ();
-          int i = 0;
-          CSSNode aChildChildNode = aChildNode.jjtGetChild (i);
-          if (ECSSNodeType.SELECTORCOMBINATOR.isNode (aChildChildNode, m_eVersion))
-          {
-            eSelectorCombinator = _createSelectorCombinator (aChildChildNode.getText ());
-            if (eSelectorCombinator != null)
-            {
-              // Skip the first elements as selector
-              i++;
-            }
-          }
-
           final ICommonsList <CSSSelector> aNestedSelectors = new CommonsArrayList <> ();
-          for (; i < nChildChildCount; ++i)
-          {
-            aChildChildNode = aChildNode.jjtGetChild (i);
-            final CSSSelector aSelector = _createSelector (aChildChildNode);
-            aNestedSelectors.add (aSelector);
-          }
+          for (int j = 0; j < nChildChildCount; ++j)
+            aNestedSelectors.add (_createRelativeSelector(aChildNode.jjtGetChild (j)));
 
-          final CSSSelectorMemberPseudoHas ret = new CSSSelectorMemberPseudoHas (eSelectorCombinator, aNestedSelectors);
+          final CSSSelectorMemberPseudoHas ret = new CSSSelectorMemberPseudoHas (aNestedSelectors);
           if (m_bUseSourceLocation)
             ret.setSourceLocation (aNode.getSourceLocation ());
           return ret;
@@ -355,11 +337,7 @@ private ICSSSelectorMember _createSelectorMember (final CSSNode aNode)
           final int nChildChildCount = aChildNode.jjtGetNumChildren ();
           final ICommonsList <CSSSelector> aNestedSelectors = new CommonsArrayList <> ();
           for (int j = 0; j < nChildChildCount; ++j)
-          {
-            final CSSSelector aSelector = _createSelector (aChildNode.jjtGetChild (j));
-            aNestedSelectors.add (aSelector);
-          }
-
+            aNestedSelectors.add (_createSelector (aChildNode.jjtGetChild (j)));
           final CSSSelectorMemberPseudoWhere ret = new CSSSelectorMemberPseudoWhere (aNestedSelectors);
           if (m_bUseSourceLocation)
             ret.setSourceLocation (aNode.getSourceLocation ());
@@ -371,11 +349,7 @@ private ICSSSelectorMember _createSelectorMember (final CSSNode aNode)
           final int nChildChildCount = aChildNode.jjtGetNumChildren ();
           final ICommonsList <CSSSelector> aNestedSelectors = new CommonsArrayList <> ();
           for (int j = 0; j < nChildChildCount; ++j)
-          {
-            final CSSSelector aSelector = _createSelector (aChildNode.jjtGetChild (j));
-            aNestedSelectors.add (aSelector);
-          }
-
+            aNestedSelectors.add (_createSelector (aChildNode.jjtGetChild (j)));
           final CSSSelectorMemberPseudoIs ret = new CSSSelectorMemberPseudoIs (aNestedSelectors);
           if (m_bUseSourceLocation)
             ret.setSourceLocation (aNode.getSourceLocation ());
@@ -423,6 +397,23 @@ private CSSSelector _createSelector (@Nonnull final CSSNode aNode)
     return ret;
   }
 
+  @Nonnull
+  private CSSSelector _createRelativeSelector (@Nonnull final CSSNode aNode)
+  {
+    _expectNodeType (aNode, ECSSNodeType.RELATIVESELECTOR);
+
+    final CSSSelector ret = new CSSSelector ();
+    if (m_bUseSourceLocation)
+      ret.setSourceLocation (aNode.getSourceLocation ());
+    for (final CSSNode aChildNode : aNode)
+    {
+      final ICSSSelectorMember aMember = _createSelectorMember (aChildNode);
+      if (aMember != null)
+        ret.addMember (aMember);
+    }
+    return ret;
+  }
+
   @Nonnull
   private CSSExpressionMemberMathProduct _createExpressionCalcProduct (@Nonnull final CSSNode aNode)
   {

ph-css/src/main/java/com/helger/css/handler/ECSSNodeType.java

@@ -49,6 +49,7 @@ public enum ECSSNodeType
   FONTFACERULE (ParserCSS30TreeConstants.JJTFONTFACERULE),
   // top level -- style rule
   SELECTOR (ParserCSS30TreeConstants.JJTSELECTOR),
+  RELATIVESELECTOR (ParserCSS30TreeConstants.JJTRELATIVESELECTOR),
   STYLEDECLARATIONLIST (ParserCSS30TreeConstants.JJTSTYLEDECLARATIONLIST),
   STYLEDECLARATION (ParserCSS30TreeConstants.JJTSTYLEDECLARATION),
   // style rule -- selector

ph-css/src/main/jjtree/ParserCSS30.jjt

@@ -1060,23 +1060,25 @@ void pseudoSlotted () #slotted : {}
   )*
 }
 
-void relativeSelector() #void : {}
+void relativeSelector() : {}
 {
   ( selectorCombinator()
     ( <S> )*
   )?  
   selector ()
-  ( <S> )*
-  ( <COMMA>
-    ( <S> )*
-    selector()
-    ( <S> )*
-  )*
 }
 
 void relativeSelectorList() #void : {}
 {
-  ( relativeSelector() )*
+  ( <S> )*
+  ( relativeSelector() 
+    ( <S> )*
+    ( <COMMA> 
+      ( <S> )*
+      relativeSelector ()
+      ( <S> )*
+    )*
+  )
 }
 
 void pseudoHas() #has : {}
@@ -1085,16 +1087,26 @@ void pseudoHas() #has : {}
   relativeSelectorList()
 }
 
-void pseudoIs() #is : {}
+void simpleSelectorList() #void : {}
 {
   ( <S> )*
-  relativeSelectorList()
+  ( selector () 
+    ( <S> )*
+    ( <COMMA> 
+      ( <S> )*
+      selector ()
+      ( <S> )*
+    )*
+  )
+}
+void pseudoIs() #is : {}
+{
+  simpleSelectorList ()
 }
 
 void pseudoWhere() #where : {}
 {
-  ( <S> )*
-  relativeSelectorList()
+  simpleSelectorList ()
 }
 
 void pseudoClassSelector() : {}