inherit Selectors::ComplexSelector and ::Combinator from Node

and improve their formatting

Author: flavorjones

lib/syntax_tree/css/pretty_print.rb

@@ -421,6 +421,28 @@ def visit_wqname(node)
         end
       end
 
+      # Visit a Selectors::Combinator node.
+      def visit_combinator(node)
+        token("combinator") do
+          q.breakable
+          q.pp(node.value)
+        end
+      end
+
+      # Visit a Selectors::ComplexSelector node.
+      def visit_complex_selector(node)
+        token("complex-selector") do
+          q.breakable
+          q.pp(node.left)
+
+          q.breakable
+          q.pp(node.combinator)
+
+          q.breakable
+          q.pp(node.right)
+        end
+      end
+
       # Visit a Selectors::CompoundSelector node.
       def visit_compound_selector(node)
         token("compound-selector") do

lib/syntax_tree/css/selectors.rb

@@ -71,8 +71,51 @@ def deconstruct_keys(keys)
         end
       end
 
-      Combinator = Struct.new(:value, keyword_init: true)
-      ComplexSelector = Struct.new(:left, :combinator, :right, keyword_init: true)
+      class Combinator < Node
+        attr_reader :value
+
+        def initialize(value:)
+          @value = value
+        end
+
+        def accept(visitor)
+          visitor.visit_combinator(self)
+        end
+
+        def child_nodes
+          [value]
+        end
+
+        alias deconstruct child_nodes
+
+        def deconstruct_keys(keys)
+          { value: value }
+        end
+      end
+
+      class ComplexSelector < Node
+        attr_reader :left, :combinator, :right
+
+        def initialize(left:, combinator:, right:)
+          @left = left
+          @combinator = combinator
+          @right = right
+        end
+
+        def accept(visitor)
+          visitor.visit_complex_selector(self)
+        end
+
+        def child_nodes
+          [left, combinator, right]
+        end
+
+        alias deconstruct child_nodes
+
+        def deconstruct_keys(keys)
+          { left: left, combinator: combinator, right: right }
+        end
+      end
 
       class CompoundSelector < Node
         attr_reader :type, :subclasses, :pseudo_elements

lib/syntax_tree/css/visitor.rb

@@ -132,6 +132,12 @@ def visit_child_nodes(node)
       # Visit a Selectors::ClassSelector node.
       alias visit_class_selector visit_child_nodes
 
+      # Visit a Selectors::Combinator node.
+      alias visit_combinator visit_child_nodes
+
+      # Visit a Selectors::ComplexSelector node.
+      alias visit_complex_selector visit_child_nodes
+
       # Visit a Selectors::CompoundSelector node.
       alias visit_compound_selector visit_child_nodes