Commite942b9e

committed

inherit Selectors::CompoundSelector from Node

and improve its formatting

1 parent63f2235 commite942b9eCopy full SHA for e942b9e

File tree

+69

-1

lines changed

+69

-1

lines changed

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,44 @@ def visit_wqname(node)`
`421`	`421`	`end`
`422`	`422`	`end`
`423`	`423`
	`424`	`+# Visit a Selectors::CompoundSelector node.`
	`425`	`+defvisit_compound_selector(node)`
	`426`	`+token("compound-selector")do`
	`427`	`+q.breakable`
	`428`	`+q.pp(node.type)`
	`429`	`+`
	`430`	`+q.breakable`
	`431`	`+q.text("(subclasses")`
	`432`	`+`
	`433`	`+ifnode.subclasses.any?`
	`434`	`+q.nest(2)do`
	`435`	`+q.breakable`
	`436`	`+q.seplist(node.subclasses){ \|subclass\|q.pp(subclass)}`
	`437`	`+end`
	`438`	`+`
	`439`	`+q.breakable("")`
	`440`	`+end`
	`441`	`+`
	`442`	`+q.text(")")`
	`443`	`+`
	`444`	`+q.breakable("")`
	`445`	`+q.text("(pseudo-elements")`
	`446`	`+`
	`447`	`+ifnode.pseudo_elements.any?`
	`448`	`+q.nest(2)do`
	`449`	`+q.breakable`
	`450`	`+q.seplist(node.pseudo_elements)do \|pseudo_element\|`
	`451`	`+q.pp(pseudo_element)`
	`452`	`+end`
	`453`	`+end`
	`454`	`+`
	`455`	`+q.breakable("")`
	`456`	`+end`
	`457`	`+`
	`458`	`+q.text(")")`
	`459`	`+end`
	`460`	`+end`
	`461`	`+`
`424`	`462`	`private`
`425`	`463`
`426`	`464`	`deftoken(name)`

Lines changed: 28 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,34 @@ def deconstruct_keys(keys)`
`73`	`73`
`74`	`74`	`Combinator=Struct.new(:value,keyword_init:true)`
`75`	`75`	`ComplexSelector=Struct.new(:left,:combinator,:right,keyword_init:true)`
`76`		`-CompoundSelector=Struct.new(:type,:subclasses,:pseudo_elements,keyword_init:true)`
	`76`	`+`
	`77`	`+classCompoundSelector <Node`
	`78`	`+attr_reader:type,:subclasses,:pseudo_elements`
	`79`	`+`
	`80`	`+definitialize(type:,subclasses:,pseudo_elements:)`
	`81`	`+@type=type`
	`82`	`+@subclasses=subclasses`
	`83`	`+@pseudo_elements=pseudo_elements`
	`84`	`+end`
	`85`	`+`
	`86`	`+defaccept(visitor)`
	`87`	`+visitor.visit_compound_selector(self)`
	`88`	`+end`
	`89`	`+`
	`90`	`+defchild_nodes`
	`91`	`+[type,subclasses,pseudo_elements].flatten`
	`92`	`+end`
	`93`	`+`
	`94`	`+aliasdeconstructchild_nodes`
	`95`	`+`
	`96`	`+defdeconstruct_keys(keys)`
	`97`	`+{`
	`98`	`+type:type,`
	`99`	`+subclasses:subclasses,`
	`100`	`+pseudo_elements:pseudo_elements`
	`101`	`+}`
	`102`	`+end`
	`103`	`+end`
`77`	`104`
`78`	`105`	`# The ID of an element, e.g., #foo`
`79`	`106`	`# https://www.w3.org/TR/selectors-4/#typedef-id-selector`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ def visit_child_nodes(node)`
`132`	`132`	`# Visit a Selectors::ClassSelector node.`
`133`	`133`	`aliasvisit_class_selectorvisit_child_nodes`
`134`	`134`
	`135`	`+# Visit a Selectors::CompoundSelector node.`
	`136`	`+aliasvisit_compound_selectorvisit_child_nodes`
	`137`	`+`
`135`	`138`	`# Visit a Selectors::IdSelector node.`
`136`	`139`	`aliasvisit_id_selectorvisit_child_nodes`
`137`	`140`

Comments

(0)