shadowfacts
/
tree-sitter-css
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't allow line-breaks in strings

This commit is contained in:
Max Brunsfeld 2018-10-18 20:37:59 -07:00
parent dae16d4dcf
commit 8250ee9f47
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grammar.js
View File

@ -80,6 +80,7 @@ module.exports = grammar({
$.pseudo_element_selector, $.pseudo_element_selector,
$.id_selector, $.id_selector,
$.attribute_selector, $.attribute_selector,
$.string_value,
$.child_selector, $.child_selector,
$.descendant_selector $.descendant_selector
), ),
@ -190,8 +191,8 @@ module.exports = grammar({
color_value: $ => /#[0-9a-fA-F]{3,8}/, color_value: $ => /#[0-9a-fA-F]{3,8}/,
string_value: $ => token(choice( string_value: $ => token(choice(
seq("'", /([^']|\\.)+/, "'"), seq("'", /([^'\n]|\\(.|\n))+/, "'"),
seq('"', /([^"]|\\.)+/, '"') seq('"', /([^"\n]|\\(.|\n))+/, '"')
)), )),
integer_value: $ => seq( integer_value: $ => seq(

4
src/grammar.json vendored
View File

@ -304,6 +304,10 @@
"type": "SYMBOL", "type": "SYMBOL",
"name": "attribute_selector" "name": "attribute_selector"
}, },
{
"type": "SYMBOL",
"name": "string_value"
},
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "child_selector" "name": "child_selector"

31
src/parser.c vendored
View File

@ -1148,10 +1148,14 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
case 78: case 78:
if (lookahead == 0) if (lookahead == 0)
ADVANCE(1); ADVANCE(1);
if (lookahead == '\"')
ADVANCE(2);
if (lookahead == '#') if (lookahead == '#')
ADVANCE(7); ADVANCE(7);
if (lookahead == '&') if (lookahead == '&')
ADVANCE(10); ADVANCE(10);
if (lookahead == '\'')
ADVANCE(11);
if (lookahead == '*') if (lookahead == '*')
ADVANCE(79); ADVANCE(79);
if (lookahead == '.') if (lookahead == '.')
@ -1701,10 +1705,14 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
case 118: case 118:
if (lookahead == 0) if (lookahead == 0)
ADVANCE(1); ADVANCE(1);
if (lookahead == '\"')
ADVANCE(2);
if (lookahead == '#') if (lookahead == '#')
ADVANCE(7); ADVANCE(7);
if (lookahead == '&') if (lookahead == '&')
ADVANCE(10); ADVANCE(10);
if (lookahead == '\'')
ADVANCE(11);
if (lookahead == '*') if (lookahead == '*')
ADVANCE(79); ADVANCE(79);
if (lookahead == '.') if (lookahead == '.')
@ -2061,6 +2069,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(13),
[sym_identifier] = ACTIONS(25), [sym_identifier] = ACTIONS(25),
[sym_at_keyword] = ACTIONS(27), [sym_at_keyword] = ACTIONS(27),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2195,6 +2204,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(13),
[sym_identifier] = ACTIONS(25), [sym_identifier] = ACTIONS(25),
[sym_at_keyword] = ACTIONS(27), [sym_at_keyword] = ACTIONS(27),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2372,6 +2382,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(153), [anon_sym_COLON_COLON] = ACTIONS(153),
[anon_sym_POUND] = ACTIONS(153), [anon_sym_POUND] = ACTIONS(153),
[anon_sym_LBRACK] = ACTIONS(153), [anon_sym_LBRACK] = ACTIONS(153),
[sym_string_value] = ACTIONS(153),
[sym_identifier] = ACTIONS(153), [sym_identifier] = ACTIONS(153),
[sym_at_keyword] = ACTIONS(155), [sym_at_keyword] = ACTIONS(155),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2404,6 +2415,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(13),
[sym_identifier] = ACTIONS(159), [sym_identifier] = ACTIONS(159),
[sym_at_keyword] = ACTIONS(27), [sym_at_keyword] = ACTIONS(27),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2442,6 +2454,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(167), [anon_sym_COLON_COLON] = ACTIONS(167),
[anon_sym_POUND] = ACTIONS(167), [anon_sym_POUND] = ACTIONS(167),
[anon_sym_LBRACK] = ACTIONS(167), [anon_sym_LBRACK] = ACTIONS(167),
[sym_string_value] = ACTIONS(167),
[sym_identifier] = ACTIONS(167), [sym_identifier] = ACTIONS(167),
[sym_at_keyword] = ACTIONS(169), [sym_at_keyword] = ACTIONS(169),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2462,6 +2475,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(171),
[sym_identifier] = ACTIONS(25), [sym_identifier] = ACTIONS(25),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
}, },
@ -2481,6 +2495,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(173),
[sym_identifier] = ACTIONS(25), [sym_identifier] = ACTIONS(25),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
}, },
@ -2520,6 +2535,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(185),
[sym_identifier] = ACTIONS(25), [sym_identifier] = ACTIONS(25),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
}, },
@ -2556,6 +2572,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(209), [anon_sym_COLON_COLON] = ACTIONS(209),
[anon_sym_POUND] = ACTIONS(212), [anon_sym_POUND] = ACTIONS(212),
[anon_sym_LBRACK] = ACTIONS(215), [anon_sym_LBRACK] = ACTIONS(215),
[sym_string_value] = ACTIONS(200),
[sym_identifier] = ACTIONS(218), [sym_identifier] = ACTIONS(218),
[sym_at_keyword] = ACTIONS(221), [sym_at_keyword] = ACTIONS(221),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2616,6 +2633,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(240), [anon_sym_COLON_COLON] = ACTIONS(240),
[anon_sym_POUND] = ACTIONS(240), [anon_sym_POUND] = ACTIONS(240),
[anon_sym_LBRACK] = ACTIONS(240), [anon_sym_LBRACK] = ACTIONS(240),
[sym_string_value] = ACTIONS(240),
[sym_identifier] = ACTIONS(240), [sym_identifier] = ACTIONS(240),
[sym_at_keyword] = ACTIONS(242), [sym_at_keyword] = ACTIONS(242),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2707,6 +2725,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(258), [anon_sym_COLON_COLON] = ACTIONS(258),
[anon_sym_POUND] = ACTIONS(258), [anon_sym_POUND] = ACTIONS(258),
[anon_sym_LBRACK] = ACTIONS(258), [anon_sym_LBRACK] = ACTIONS(258),
[sym_string_value] = ACTIONS(258),
[sym_identifier] = ACTIONS(258), [sym_identifier] = ACTIONS(258),
[sym_at_keyword] = ACTIONS(260), [sym_at_keyword] = ACTIONS(260),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2731,6 +2750,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(262), [anon_sym_COLON_COLON] = ACTIONS(262),
[anon_sym_POUND] = ACTIONS(262), [anon_sym_POUND] = ACTIONS(262),
[anon_sym_LBRACK] = ACTIONS(262), [anon_sym_LBRACK] = ACTIONS(262),
[sym_string_value] = ACTIONS(262),
[sym_identifier] = ACTIONS(262), [sym_identifier] = ACTIONS(262),
[sym_at_keyword] = ACTIONS(264), [sym_at_keyword] = ACTIONS(264),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2797,6 +2817,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(280), [anon_sym_COLON_COLON] = ACTIONS(280),
[anon_sym_POUND] = ACTIONS(280), [anon_sym_POUND] = ACTIONS(280),
[anon_sym_LBRACK] = ACTIONS(280), [anon_sym_LBRACK] = ACTIONS(280),
[sym_string_value] = ACTIONS(280),
[sym_identifier] = ACTIONS(280), [sym_identifier] = ACTIONS(280),
[sym_at_keyword] = ACTIONS(282), [sym_at_keyword] = ACTIONS(282),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2841,6 +2862,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(19), [anon_sym_COLON_COLON] = ACTIONS(19),
[anon_sym_POUND] = ACTIONS(21), [anon_sym_POUND] = ACTIONS(21),
[anon_sym_LBRACK] = ACTIONS(23), [anon_sym_LBRACK] = ACTIONS(23),
[sym_string_value] = ACTIONS(13),
[sym_identifier] = ACTIONS(159), [sym_identifier] = ACTIONS(159),
[sym_at_keyword] = ACTIONS(27), [sym_at_keyword] = ACTIONS(27),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -2869,6 +2891,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(288), [anon_sym_COLON_COLON] = ACTIONS(288),
[anon_sym_POUND] = ACTIONS(288), [anon_sym_POUND] = ACTIONS(288),
[anon_sym_LBRACK] = ACTIONS(288), [anon_sym_LBRACK] = ACTIONS(288),
[sym_string_value] = ACTIONS(288),
[sym_identifier] = ACTIONS(288), [sym_identifier] = ACTIONS(288),
[sym_at_keyword] = ACTIONS(290), [sym_at_keyword] = ACTIONS(290),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3034,6 +3057,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(335), [anon_sym_COLON_COLON] = ACTIONS(335),
[anon_sym_POUND] = ACTIONS(335), [anon_sym_POUND] = ACTIONS(335),
[anon_sym_LBRACK] = ACTIONS(335), [anon_sym_LBRACK] = ACTIONS(335),
[sym_string_value] = ACTIONS(335),
[sym_identifier] = ACTIONS(335), [sym_identifier] = ACTIONS(335),
[sym_at_keyword] = ACTIONS(337), [sym_at_keyword] = ACTIONS(337),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3116,6 +3140,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(349), [anon_sym_COLON_COLON] = ACTIONS(349),
[anon_sym_POUND] = ACTIONS(349), [anon_sym_POUND] = ACTIONS(349),
[anon_sym_LBRACK] = ACTIONS(349), [anon_sym_LBRACK] = ACTIONS(349),
[sym_string_value] = ACTIONS(349),
[sym_identifier] = ACTIONS(349), [sym_identifier] = ACTIONS(349),
[sym_at_keyword] = ACTIONS(351), [sym_at_keyword] = ACTIONS(351),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3173,6 +3198,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(368), [anon_sym_COLON_COLON] = ACTIONS(368),
[anon_sym_POUND] = ACTIONS(368), [anon_sym_POUND] = ACTIONS(368),
[anon_sym_LBRACK] = ACTIONS(368), [anon_sym_LBRACK] = ACTIONS(368),
[sym_string_value] = ACTIONS(368),
[sym_identifier] = ACTIONS(368), [sym_identifier] = ACTIONS(368),
[sym_at_keyword] = ACTIONS(370), [sym_at_keyword] = ACTIONS(370),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3205,6 +3231,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(392), [anon_sym_COLON_COLON] = ACTIONS(392),
[anon_sym_POUND] = ACTIONS(395), [anon_sym_POUND] = ACTIONS(395),
[anon_sym_LBRACK] = ACTIONS(398), [anon_sym_LBRACK] = ACTIONS(398),
[sym_string_value] = ACTIONS(383),
[sym_identifier] = ACTIONS(401), [sym_identifier] = ACTIONS(401),
[sym_at_keyword] = ACTIONS(404), [sym_at_keyword] = ACTIONS(404),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3230,6 +3257,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(407), [anon_sym_COLON_COLON] = ACTIONS(407),
[anon_sym_POUND] = ACTIONS(407), [anon_sym_POUND] = ACTIONS(407),
[anon_sym_LBRACK] = ACTIONS(407), [anon_sym_LBRACK] = ACTIONS(407),
[sym_string_value] = ACTIONS(407),
[sym_identifier] = ACTIONS(407), [sym_identifier] = ACTIONS(407),
[sym_at_keyword] = ACTIONS(409), [sym_at_keyword] = ACTIONS(409),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3325,6 +3353,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(432), [anon_sym_COLON_COLON] = ACTIONS(432),
[anon_sym_POUND] = ACTIONS(432), [anon_sym_POUND] = ACTIONS(432),
[anon_sym_LBRACK] = ACTIONS(432), [anon_sym_LBRACK] = ACTIONS(432),
[sym_string_value] = ACTIONS(432),
[sym_identifier] = ACTIONS(432), [sym_identifier] = ACTIONS(432),
[sym_at_keyword] = ACTIONS(434), [sym_at_keyword] = ACTIONS(434),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3531,6 +3560,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(480), [anon_sym_COLON_COLON] = ACTIONS(480),
[anon_sym_POUND] = ACTIONS(480), [anon_sym_POUND] = ACTIONS(480),
[anon_sym_LBRACK] = ACTIONS(480), [anon_sym_LBRACK] = ACTIONS(480),
[sym_string_value] = ACTIONS(480),
[sym_identifier] = ACTIONS(480), [sym_identifier] = ACTIONS(480),
[sym_at_keyword] = ACTIONS(478), [sym_at_keyword] = ACTIONS(478),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),
@ -3600,6 +3630,7 @@ static uint16_t ts_parse_table[STATE_COUNT][SYMBOL_COUNT] = {
[anon_sym_COLON_COLON] = ACTIONS(498), [anon_sym_COLON_COLON] = ACTIONS(498),
[anon_sym_POUND] = ACTIONS(498), [anon_sym_POUND] = ACTIONS(498),
[anon_sym_LBRACK] = ACTIONS(498), [anon_sym_LBRACK] = ACTIONS(498),
[sym_string_value] = ACTIONS(498),
[sym_identifier] = ACTIONS(498), [sym_identifier] = ACTIONS(498),
[sym_at_keyword] = ACTIONS(496), [sym_at_keyword] = ACTIONS(496),
[sym_comment] = ACTIONS(29), [sym_comment] = ACTIONS(29),