Merge pull request #62 from flavorjones/flavorjones-pseudo-class-functions

Parse pseudo-class function arguments

Author: kddnewton

lib/syntax_tree/css/format.rb

@@ -100,6 +100,16 @@ def visit_pseudo_class_selector(node)
         node.value.format(q)
       end
 
+      # Visit a Selectors::PseudoClassFunction node.
+      def visit_pseudo_class_function(node)
+        q.text(node.name)
+        q.text("(")
+        q.seplist(node.arguments, -> { q.text(", ") }) do |selector|
+          selector.format(q)
+        end
+        q.text(")")
+      end
+
       # Visit a Selectors::PseudoElementSelector node.
       def visit_pseudo_element_selector(node)
         q.text(":")
@@ -137,7 +147,6 @@ def visit_compound_selector(node)
           node.child_nodes.each do |node_|
             node_.format(q)
           end
-          # TODO: pseudo-elements
         end
       end
 

lib/syntax_tree/css/pretty_print.rb

@@ -380,10 +380,19 @@ def visit_pseudo_class_function(node)
           q.breakable
           q.pp(node.name)
 
+          q.breakable
+          q.text("(arguments")
+
           if node.arguments.any?
-            q.breakable
-            q.seplist(node.arguments) { |argument| q.pp(argument) }
+            q.nest(2) do
+              q.breakable
+              q.seplist(node.arguments) { |argument| q.pp(argument) }
+            end
+
+            q.breakable("")
           end
+
+          q.text(")")
         end
       end
 
@@ -443,7 +452,10 @@ def visit_complex_selector(node)
       def visit_compound_selector(node)
         token("compound-selector") do
           q.breakable
-          q.pp(node.type)
+          token("type") do
+            q.breakable
+            q.pp(node.type)
+          end
 
           q.breakable
           q.text("(subclasses")

lib/syntax_tree/css/selectors.rb

@@ -533,7 +533,8 @@ def pseudo_class_selector
           PseudoClassSelector.new(value: consume(IdentToken))
         in Function
           node = consume(Function)
-          function = PseudoClassFunction.new(name: node.name, arguments: node.value)
+          arguments = Selectors.new(node.value).parse
+          function = PseudoClassFunction.new(name: node.name, arguments: arguments)
           PseudoClassSelector.new(value: function)
         else
           raise MissingTokenError, "Expected pseudo class selector to produce something"

test/selectors_test.rb

@@ -82,7 +82,7 @@ class SelectorsTest < Minitest::Spec
           end
         end
 
-        it "parses a compound selector with a pseudo-class" do
+        it "parses a compound selector with a pseudo-class selector" do
           actual = parse_selectors("div.flex:hover")
 
           assert_pattern do
@@ -98,6 +98,33 @@ class SelectorsTest < Minitest::Spec
           end
         end
 
+        it "parses a compound selector with a pseudo-class function" do
+          actual = parse_selectors(".flex:not(div, span.wide, .hidden)")
+
+          assert_pattern do
+            actual => [
+              Selectors::CompoundSelector[
+                type: nil,
+                subclasses: [
+                  Selectors::ClassSelector[value: { value: "flex" }],
+                  Selectors::PseudoClassSelector[
+                    value: Selectors::PseudoClassFunction[
+                      name: "not",
+                      arguments: [
+                        Selectors::TypeSelector[value: { name: { value: "div" } }],
+                        Selectors::CompoundSelector[
+                          Selectors::TypeSelector[value: { name: { value: "span" } }],
+                          Selectors::ClassSelector[value: { value: "wide" }],
+                        ],
+                      ],
+                    ],
+                  ],
+                ],
+              ]
+            ]
+          end
+        end
+
         it "parses a compound selector with pseudo-elements and pseudo-classes" do
           actual = parse_selectors("div.flex:hover::first-line:last-child:active::first-letter")
 
@@ -218,7 +245,6 @@ class SelectorsTest < Minitest::Spec
             ]
           end
         end
-
       end
 
       describe "formatting" do
@@ -237,6 +263,13 @@ class SelectorsTest < Minitest::Spec
             )
           end
 
+          it "with a pseudo-class function" do
+            assert_selector_format(
+              ".flex:not(div, span.wide, .hidden)",
+              ".flex:not(div, span.wide, .hidden)",
+            )
+          end
+
           it "with class selectors" do
             assert_selector_format(
               "div.flex.text-xl",