Add selectors as arguments to :not

This commit is contained in:
Max Brunsfeld 2018-10-26 14:23:46 -07:00
parent c8a95409ae
commit 034eda815e
4 changed files with 3390 additions and 2961 deletions

View File

@ -179,3 +179,26 @@ a.b ~ c.d {}
(class_selector (class_selector (class_name)) (class_name)) (class_selector (class_selector (class_name)) (class_name))
(class_selector (class_selector (class_name)) (class_name)))) (class_selector (class_selector (class_name)) (class_name))))
(block))) (block)))
===========================
The :not selector
===========================
a:not(:hover) {}
.b:not(c > .d) {}
---
(stylesheet
(rule_set
(selectors (pseudo_class_selector
(tag_name)
(class_name)
(arguments (pseudo_class_selector (class_name)))))
(block))
(rule_set
(selectors (pseudo_class_selector
(class_selector (class_name))
(class_name)
(arguments (child_selector (tag_name) (class_selector (class_name))))))
(block)))

View File

@ -137,7 +137,7 @@ module.exports = grammar({
optional($._selector), optional($._selector),
':', ':',
alias($.identifier, $.class_name), alias($.identifier, $.class_name),
optional($.arguments) optional(alias($.pseudo_class_arguments, $.arguments))
), ),
pseudo_element_selector: $ => seq( pseudo_element_selector: $ => seq(
@ -171,6 +171,12 @@ module.exports = grammar({
adjacent_sibling_selector: $ => prec.left(seq($._selector, '+', $._selector)), adjacent_sibling_selector: $ => prec.left(seq($._selector, '+', $._selector)),
pseudo_class_arguments: $ => seq(
token.immediate('('),
commaSep(choice($._selector, repeat1($._value))),
')'
),
// Declarations // Declarations
declaration: $ => prec(1, seq( declaration: $ => prec(1, seq(
@ -232,7 +238,7 @@ module.exports = grammar({
// Property Values // Property Values
_value: $ => choice( _value: $ => prec(-1, choice(
alias($.identifier, $.plain_value), alias($.identifier, $.plain_value),
$.plain_value, $.plain_value,
$.color_value, $.color_value,
@ -241,7 +247,7 @@ module.exports = grammar({
$.string_value, $.string_value,
$.binary_expression, $.binary_expression,
$.call_expression $.call_expression
), )),
color_value: $ => /#[0-9a-fA-F]{3,8}/, color_value: $ => /#[0-9a-fA-F]{3,8}/,

164
src/grammar.json vendored
View File

@ -548,8 +548,13 @@
"type": "CHOICE", "type": "CHOICE",
"members": [ "members": [
{ {
"type": "SYMBOL", "type": "ALIAS",
"name": "arguments" "content": {
"type": "SYMBOL",
"name": "pseudo_class_arguments"
},
"named": true,
"value": "arguments"
}, },
{ {
"type": "BLANK" "type": "BLANK"
@ -782,6 +787,79 @@
] ]
} }
}, },
"pseudo_class_arguments": {
"type": "SEQ",
"members": [
{
"type": "IMMEDIATE_TOKEN",
"content": {
"type": "STRING",
"value": "("
}
},
{
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_selector"
},
{
"type": "REPEAT1",
"content": {
"type": "SYMBOL",
"name": "_value"
}
}
]
},
{
"type": "REPEAT",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_selector"
},
{
"type": "REPEAT1",
"content": {
"type": "SYMBOL",
"name": "_value"
}
}
]
}
]
}
}
]
},
{
"type": "BLANK"
}
]
},
{
"type": "STRING",
"value": ")"
}
]
},
"declaration": { "declaration": {
"type": "PREC", "type": "PREC",
"value": 1, "value": 1,
@ -1002,46 +1080,50 @@
] ]
}, },
"_value": { "_value": {
"type": "CHOICE", "type": "PREC",
"members": [ "value": -1,
{ "content": {
"type": "ALIAS", "type": "CHOICE",
"content": { "members": [
"type": "SYMBOL", {
"name": "identifier" "type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "identifier"
},
"named": true,
"value": "plain_value"
}, },
"named": true, {
"value": "plain_value" "type": "SYMBOL",
}, "name": "plain_value"
{ },
"type": "SYMBOL", {
"name": "plain_value" "type": "SYMBOL",
}, "name": "color_value"
{ },
"type": "SYMBOL", {
"name": "color_value" "type": "SYMBOL",
}, "name": "integer_value"
{ },
"type": "SYMBOL", {
"name": "integer_value" "type": "SYMBOL",
}, "name": "float_value"
{ },
"type": "SYMBOL", {
"name": "float_value" "type": "SYMBOL",
}, "name": "string_value"
{ },
"type": "SYMBOL", {
"name": "string_value" "type": "SYMBOL",
}, "name": "binary_expression"
{ },
"type": "SYMBOL", {
"name": "binary_expression" "type": "SYMBOL",
}, "name": "call_expression"
{ }
"type": "SYMBOL", ]
"name": "call_expression" }
}
]
}, },
"color_value": { "color_value": {
"type": "PATTERN", "type": "PATTERN",

6152
src/parser.c vendored

File diff suppressed because it is too large Load Diff