language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-19 01:50:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Attach comma token to MATCH_ARM instead of MATCH_ARM_LIST

Browse source
This commit is contained in:
Lukas Wirth 2021-07-29 22:32:24 +02:00
parent 8d3b294ef7
commit 4de447b293
15 changed files with 113 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..113
MATCH_ARM_LIST@25..110
L_CURLY@25..26 "{"
WHITESPACE@26..35 "\n "
MATCH_ARM@35..43
MATCH_ARM@35..44
LITERAL_PAT@35..37
MINUS@35..36 "-"
LITERAL@36..37
@ -32,9 +32,9 @@ SOURCE_FILE@0..113
TUPLE_EXPR@41..43
L_PAREN@41..42 "("
R_PAREN@42..43 ")"
COMMA@43..44 ","
COMMA@43..44 ","
WHITESPACE@44..53 "\n "
MATCH_ARM@53..61
MATCH_ARM@53..62
LITERAL_PAT@53..55
LITERAL@53..55
INT_NUMBER@53..55 "92"
@ -44,9 +44,9 @@ SOURCE_FILE@0..113
TUPLE_EXPR@59..61
L_PAREN@59..60 "("
R_PAREN@60..61 ")"
COMMA@61..62 ","
COMMA@61..62 ","
WHITESPACE@62..71 "\n "
MATCH_ARM@71..80
MATCH_ARM@71..81
LITERAL_PAT@71..74
LITERAL@71..74
CHAR@71..74 "'c'"
@ -56,9 +56,9 @@ SOURCE_FILE@0..113
TUPLE_EXPR@78..80
L_PAREN@78..79 "("
R_PAREN@79..80 ")"
COMMA@80..81 ","
COMMA@80..81 ","
WHITESPACE@81..90 "\n "
MATCH_ARM@90..103
MATCH_ARM@90..104
LITERAL_PAT@90..97
LITERAL@90..97
STRING@90..97 "\"hello\""
@ -68,7 +68,7 @@ SOURCE_FILE@0..113
TUPLE_EXPR@101..103
L_PAREN@101..102 "("
R_PAREN@102..103 ")"
COMMA@103..104 ","
COMMA@103..104 ","
WHITESPACE@104..109 "\n "
R_CURLY@109..110 "}"
WHITESPACE@110..111 "\n"

12
crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast
View file

@ -20,7 +20,7 @@ SOURCE_FILE@0..112
MATCH_ARM_LIST@25..109
L_CURLY@25..26 "{"
WHITESPACE@26..35 "\n "
MATCH_ARM@35..50
MATCH_ARM@35..51
RANGE_PAT@35..44
LITERAL_PAT@35..36
LITERAL@35..36
@ -37,9 +37,9 @@ SOURCE_FILE@0..112
TUPLE_EXPR@48..50
L_PAREN@48..49 "("
R_PAREN@49..50 ")"
COMMA@50..51 ","
COMMA@50..51 ","
WHITESPACE@51..60 "\n "
MATCH_ARM@60..77
MATCH_ARM@60..78
RANGE_PAT@60..71
LITERAL_PAT@60..63
LITERAL@60..63
@ -56,9 +56,9 @@ SOURCE_FILE@0..112
TUPLE_EXPR@75..77
L_PAREN@75..76 "("
R_PAREN@76..77 ")"
COMMA@77..78 ","
COMMA@77..78 ","
WHITESPACE@78..87 "\n "
MATCH_ARM@87..102
MATCH_ARM@87..103
RANGE_PAT@87..97
LITERAL_PAT@87..90
LITERAL@87..90
@ -74,7 +74,7 @@ SOURCE_FILE@0..112
TUPLE_EXPR@100..102
L_PAREN@100..101 "("
R_PAREN@101..102 ")"
COMMA@102..103 ","
COMMA@102..103 ","
WHITESPACE@103..108 "\n "
R_CURLY@108..109 "}"
WHITESPACE@109..110 "\n"

4
crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..83
MATCH_ARM_LIST@24..80
L_CURLY@24..25 "{"
WHITESPACE@25..34 "\n "
MATCH_ARM@34..41
MATCH_ARM@34..42
WILDCARD_PAT@34..35
UNDERSCORE@34..35 "_"
WHITESPACE@35..36 " "
@ -30,7 +30,7 @@ SOURCE_FILE@0..83
TUPLE_EXPR@39..41
L_PAREN@39..40 "("
R_PAREN@40..41 ")"
COMMA@41..42 ","
COMMA@41..42 ","
WHITESPACE@42..51 "\n "
MATCH_ARM@51..58
WILDCARD_PAT@51..52

20
crates/syntax/test_data/parser/inline/ok/0066_match_arm.rast
View file

@ -22,7 +22,7 @@ SOURCE_FILE@0..167
MATCH_ARM_LIST@24..163
L_CURLY@24..25 "{"
WHITESPACE@25..34 "\n "
MATCH_ARM@34..41
MATCH_ARM@34..42
WILDCARD_PAT@34..35
UNDERSCORE@34..35 "_"
WHITESPACE@35..36 " "
@ -31,9 +31,9 @@ SOURCE_FILE@0..167
TUPLE_EXPR@39..41
L_PAREN@39..40 "("
R_PAREN@40..41 ")"
COMMA@41..42 ","
COMMA@41..42 ","
WHITESPACE@42..51 "\n "
MATCH_ARM@51..83
MATCH_ARM@51..84
WILDCARD_PAT@51..52
UNDERSCORE@51..52 "_"
WHITESPACE@52..53 " "
@ -70,9 +70,9 @@ SOURCE_FILE@0..167
TUPLE_EXPR@81..83
L_PAREN@81..82 "("
R_PAREN@82..83 ")"
COMMA@83..84 ","
COMMA@83..84 ","
WHITESPACE@84..93 "\n "
MATCH_ARM@93..109
MATCH_ARM@93..110
OR_PAT@93..98
IDENT_PAT@93..94
NAME@93..94
@ -98,9 +98,9 @@ SOURCE_FILE@0..167
TUPLE_EXPR@107..109
L_PAREN@107..108 "("
R_PAREN@108..109 ")"
COMMA@109..110 ","
COMMA@109..110 ","
WHITESPACE@110..119 "\n "
MATCH_ARM@119..137
MATCH_ARM@119..138
PIPE@119..120 "|"
WHITESPACE@120..121 " "
OR_PAT@121..126
@ -128,9 +128,9 @@ SOURCE_FILE@0..167
TUPLE_EXPR@135..137
L_PAREN@135..136 "("
R_PAREN@136..137 ")"
COMMA@137..138 ","
COMMA@137..138 ","
WHITESPACE@138..147 "\n "
MATCH_ARM@147..156
MATCH_ARM@147..157
PIPE@147..148 "|"
WHITESPACE@148..149 " "
IDENT_PAT@149..150
@ -142,7 +142,7 @@ SOURCE_FILE@0..167
TUPLE_EXPR@154..156
L_PAREN@154..155 "("
R_PAREN@155..156 ")"
COMMA@156..157 ","
COMMA@156..157 ","
WHITESPACE@157..162 "\n "
R_CURLY@162..163 "}"
SEMICOLON@163..164 ";"

4
crates/syntax/test_data/parser/inline/ok/0118_match_guard.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..58
MATCH_ARM_LIST@24..55
L_CURLY@24..25 "{"
WHITESPACE@25..34 "\n "
MATCH_ARM@34..48
MATCH_ARM@34..49
WILDCARD_PAT@34..35
UNDERSCORE@34..35 "_"
WHITESPACE@35..36 " "
@ -39,7 +39,7 @@ SOURCE_FILE@0..58
TUPLE_EXPR@46..48
L_PAREN@46..47 "("
R_PAREN@47..48 ")"
COMMA@48..49 ","
COMMA@48..49 ","
WHITESPACE@49..54 "\n "
R_CURLY@54..55 "}"
WHITESPACE@55..56 "\n"

4
crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
View file

@ -66,7 +66,7 @@ SOURCE_FILE@0..139
R_PAREN@111..112 ")"
R_BRACK@112..113 "]"
WHITESPACE@113..122 "\n "
MATCH_ARM@122..129
MATCH_ARM@122..130
WILDCARD_PAT@122..123
UNDERSCORE@122..123 "_"
WHITESPACE@123..124 " "
@ -75,7 +75,7 @@ SOURCE_FILE@0..139
TUPLE_EXPR@127..129
L_PAREN@127..128 "("
R_PAREN@128..129 ")"
COMMA@129..130 ","
COMMA@129..130 ","
WHITESPACE@130..135 "\n "
R_CURLY@135..136 "}"
WHITESPACE@136..137 "\n"

12
crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..259
MATCH_ARM_LIST@24..256
L_CURLY@24..25 "{"
WHITESPACE@25..34 "\n "
MATCH_ARM@34..74
MATCH_ARM@34..75
ATTR@34..58
POUND@34..35 "#"
L_BRACK@35..36 "["
@ -48,9 +48,9 @@ SOURCE_FILE@0..259
TUPLE_EXPR@72..74
L_PAREN@72..73 "("
R_PAREN@73..74 ")"
COMMA@74..75 ","
COMMA@74..75 ","
WHITESPACE@75..84 "\n "
MATCH_ARM@84..125
MATCH_ARM@84..126
ATTR@84..109
POUND@84..85 "#"
L_BRACK@85..86 "["
@ -77,9 +77,9 @@ SOURCE_FILE@0..259
TUPLE_EXPR@123..125
L_PAREN@123..124 "("
R_PAREN@124..125 ")"
COMMA@125..126 ","
COMMA@125..126 ","
WHITESPACE@126..135 "\n "
MATCH_ARM@135..249
MATCH_ARM@135..250
ATTR@135..159
POUND@135..136 "#"
L_BRACK@136..137 "["
@ -142,7 +142,7 @@ SOURCE_FILE@0..259
TUPLE_EXPR@247..249
L_PAREN@247..248 "("
R_PAREN@248..249 ")"
COMMA@249..250 ","
COMMA@249..250 ","
WHITESPACE@250..255 "\n "
R_CURLY@255..256 "}"
WHITESPACE@256..257 "\n"

16
crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..130
MATCH_ARM_LIST@25..127
L_CURLY@25..26 "{"
WHITESPACE@26..35 "\n "
MATCH_ARM@35..48
MATCH_ARM@35..49
PAREN_PAT@35..42
L_PAREN@35..36 "("
OR_PAT@36..41
@ -39,9 +39,9 @@ SOURCE_FILE@0..130
TUPLE_EXPR@46..48
L_PAREN@46..47 "("
R_PAREN@47..48 ")"
COMMA@48..49 ","
COMMA@48..49 ","
WHITESPACE@49..58 "\n "
MATCH_ARM@58..72
MATCH_ARM@58..73
REF_PAT@58..66
AMP@58..59 "&"
PAREN_PAT@59..66
@ -61,9 +61,9 @@ SOURCE_FILE@0..130
TUPLE_EXPR@70..72
L_PAREN@70..71 "("
R_PAREN@71..72 ")"
COMMA@72..73 ","
COMMA@72..73 ","
WHITESPACE@73..82 "\n "
MATCH_ARM@82..96
MATCH_ARM@82..97
TUPLE_PAT@82..90
L_PAREN@82..83 "("
OR_PAT@83..88
@ -82,9 +82,9 @@ SOURCE_FILE@0..130
TUPLE_EXPR@94..96
L_PAREN@94..95 "("
R_PAREN@95..96 ")"
COMMA@96..97 ","
COMMA@96..97 ","
WHITESPACE@97..106 "\n "
MATCH_ARM@106..120
MATCH_ARM@106..121
SLICE_PAT@106..114
L_BRACK@106..107 "["
OR_PAT@107..112
@ -103,7 +103,7 @@ SOURCE_FILE@0..130
TUPLE_EXPR@118..120
L_PAREN@118..119 "("
R_PAREN@119..120 ")"
COMMA@120..121 ","
COMMA@120..121 ","
WHITESPACE@121..126 "\n "
R_CURLY@126..127 "}"
WHITESPACE@127..128 "\n"