language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #9728

Browse source 
9728: fix: Attach comma token to MATCH_ARM instead of MATCH_ARM_LIST r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-07-30 14:11:37 +00:00 • committed by GitHub
commit 0a3ac7a96c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 296 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ide/src/join_lines.rs
View file

@ -3,11 +3,10 @@ use std::convert::TryFrom;
use ide_assists::utils::extract_trivial_expression;
use itertools::Itertools;
use syntax::{
algo::non_trivia_sibling,
ast::{self, AstNode, AstToken, IsString},
Direction, NodeOrToken, SourceFile, SyntaxElement,
NodeOrToken, SourceFile, SyntaxElement,
SyntaxKind::{self, USE_TREE, WHITESPACE},
SyntaxNode, SyntaxToken, TextRange, TextSize, T,
SyntaxToken, TextRange, TextSize, T,
};
use text_edit::{TextEdit, TextEditBuilder};
@ -204,13 +203,6 @@ fn remove_newline(
edit.replace(token.text_range(), compute_ws(prev.kind(), next.kind()).to_string());
}
fn has_comma_after(node: &SyntaxNode) -> bool {
match non_trivia_sibling(node.clone().into(), Direction::Next) {
Some(n) => n.kind() == T![,],
_ => false,
}
}
fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
let block_expr = ast::BlockExpr::cast(token.parent()?)?;
if !block_expr.is_standalone() {
@ -223,7 +215,7 @@ fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Op
// Match block needs to have a comma after the block
if let Some(match_arm) = block_expr.syntax().parent().and_then(ast::MatchArm::cast) {
if !has_comma_after(match_arm.syntax()) {
if match_arm.comma_token().is_none() {
buf.push(',');
}
}

12
crates/ide/src/move_item.rs
View file

@ -209,10 +209,10 @@ fn main() {
match true {
false =>$0 {
println!("Test");
},
}
true => {
println!("Hello, world");
}
},
};
}
"#]],
@ -240,10 +240,10 @@ fn main() {
match true {
false => {
println!("Test");
},
}
true =>$0 {
println!("Hello, world");
}
},
};
}
"#]],
@ -789,7 +789,7 @@ enum FooBar {
fn main() {}
"#,
expect![[r#"
expect![[r##"
fn main() {}
$0#[derive(Debug)]
@ -797,7 +797,7 @@ enum FooBar {
Foo,
Bar,
}
"#]],
"##]],
Direction::Down,
);
check(

6
crates/ide_assists/src/handlers/merge_match_arms.rs
View file

@ -72,7 +72,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
.join(" | ")
};
let arm = format!("{} => {}", pats, current_expr.syntax().text());
let arm = format!("{} => {},", pats, current_expr.syntax().text());
if let [first, .., last] = &*arms_to_merge {
let start = first.syntax().text_range().start();
@ -118,7 +118,7 @@ enum X { A, B, C }
fn main() {
let x = X::A;
let y = match x {
X::A | X::B => { 1i32 }
X::A | X::B => { 1i32 },
X::C => { 2i32 }
}
}
@ -183,7 +183,7 @@ fn main() {
let x = X::A;
let y = match x {
X::A => { 1i32 },
_ => { 2i32 }
_ => { 2i32 },
}
}
"#,

2
crates/ide_diagnostics/src/handlers/inactive_code.rs
View file

@ -64,7 +64,7 @@ fn f() {
match () {
() => (),
#[cfg(a)] () => (),
//^^^^^^^^^^^^^^^^^^ weak: code is inactive due to #[cfg] directives: a is disabled
//^^^^^^^^^^^^^^^^^^^ weak: code is inactive due to #[cfg] directives: a is disabled
}
#[cfg(a)] 0 // Trailing expression of block

30
crates/parser/src/grammar/expressions/atom.rs
View file

@ -400,20 +400,7 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
error_block(p, "expected match arm");
continue;
}
// test match_arms_commas
// fn foo() {
// match () {
// _ => (),
// _ => {}
// _ => ()
// }
// }
if match_arm(p).is_block() {
p.eat(T![,]);
} else if !p.at(T!['}']) {
p.expect(T![,]);
}
match_arm(p);
}
p.expect(T!['}']);
m.complete(p, MATCH_ARM_LIST);
@ -429,7 +416,7 @@ pub(crate) fn match_arm_list(p: &mut Parser) {
// | X => (),
// };
// }
fn match_arm(p: &mut Parser) -> BlockLike {
fn match_arm(p: &mut Parser) {
let m = p.start();
// test match_arms_outer_attributes
// fn foo() {
@ -452,8 +439,19 @@ fn match_arm(p: &mut Parser) -> BlockLike {
}
p.expect(T![=>]);
let blocklike = expr_stmt(p).1;
// test match_arms_commas
// fn foo() {
// match () {
// _ => (),
// _ => {}
// _ => ()
// }
// }
if !p.eat(T![,]) && !blocklike.is_block() && !p.at(T!['}']) {
p.error("expected `,`");
}
m.complete(p, MATCH_ARM);
blocklike
}
// test match_guard

14
crates/syntax/src/ast/edit_in_place.rs
View file

@ -359,14 +359,10 @@ impl ast::MatchArmList {
let mut elements = Vec::new();
let position = match self.arms().last() {
Some(last_arm) => {
let comma = last_arm
.syntax()
.siblings_with_tokens(Direction::Next)
.find(|it| it.kind() == T![,]);
if needs_comma(&last_arm) && comma.is_none() {
elements.push(make::token(SyntaxKind::COMMA).into());
if needs_comma(&last_arm) {
ted::append_child(last_arm.syntax(), make::token(SyntaxKind::COMMA));
}
Position::after(comma.unwrap_or_else(|| last_arm.syntax().clone().into()))
Position::after(last_arm.syntax().clone())
}
None => match self.l_curly_token() {
Some(it) => Position::after(it),
@ -377,12 +373,12 @@ impl ast::MatchArmList {
elements.push(make::tokens::whitespace(&format!("\n{}", indent)).into());
elements.push(arm.syntax().clone().into());
if needs_comma(&arm) {
elements.push(make::token(SyntaxKind::COMMA).into());
ted::append_child(arm.syntax(), make::token(SyntaxKind::COMMA));
}
ted::insert_all(position, elements);
fn needs_comma(arm: &ast::MatchArm) -> bool {
arm.expr().map_or(false, |e| !e.is_block_like())
arm.expr().map_or(false, |e| !e.is_block_like()) && arm.comma_token().is_none()
}
}
}

16
crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
View file

@ -22,7 +22,7 @@ SOURCE_FILE@0..293
MATCH_ARM_LIST@24..101
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 " "
@ -53,7 +53,7 @@ SOURCE_FILE@0..293
R_PAREN@76..77 ")"
R_BRACK@77..78 "]"
WHITESPACE@78..87 "\n "
MATCH_ARM@87..94
MATCH_ARM@87..95
WILDCARD_PAT@87..88
UNDERSCORE@87..88 "_"
WHITESPACE@88..89 " "
@ -77,7 +77,7 @@ SOURCE_FILE@0..293
MATCH_ARM_LIST@116..185
L_CURLY@116..117 "{"
WHITESPACE@117..126 "\n "
MATCH_ARM@126..133
MATCH_ARM@126..134
WILDCARD_PAT@126..127
UNDERSCORE@126..127 "_"
WHITESPACE@127..128 " "
@ -88,7 +88,7 @@ SOURCE_FILE@0..293
R_PAREN@132..133 ")"
COMMA@133..134 ","
WHITESPACE@134..143 "\n "
MATCH_ARM@143..150
MATCH_ARM@143..151
WILDCARD_PAT@143..144
UNDERSCORE@143..144 "_"
WHITESPACE@144..145 " "
@ -165,7 +165,7 @@ SOURCE_FILE@0..293
R_PAREN@248..249 ")"
R_BRACK@249..250 "]"
WHITESPACE@250..259 "\n "
MATCH_ARM@259..266
MATCH_ARM@259..267
WILDCARD_PAT@259..260
UNDERSCORE@259..260 "_"
WHITESPACE@260..261 " "
@ -176,7 +176,7 @@ SOURCE_FILE@0..293
R_PAREN@265..266 ")"
COMMA@266..267 ","
WHITESPACE@267..276 "\n "
MATCH_ARM@276..283
MATCH_ARM@276..284
WILDCARD_PAT@276..277
UNDERSCORE@276..277 "_"
WHITESPACE@277..278 " "
@ -194,11 +194,11 @@ SOURCE_FILE@0..293
error 52..52: expected `[`
error 52..52: expected pattern
error 53..53: expected FAT_ARROW
error 78..78: expected COMMA
error 78..78: expected `,`
error 161..161: expected `[`
error 161..161: expected pattern
error 162..162: expected FAT_ARROW
error 232..232: expected `[`
error 232..232: expected pattern
error 233..233: expected FAT_ARROW
error 250..250: expected COMMA
error 250..250: expected `,`

4
crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
View file

@ -21,7 +21,7 @@ SOURCE_FILE@0..89
MATCH_ARM_LIST@24..86
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 " "
@ -32,7 +32,7 @@ SOURCE_FILE@0..89
R_PAREN@40..41 ")"
COMMA@41..42 ","
WHITESPACE@42..51 "\n "
MATCH_ARM@51..58
MATCH_ARM@51..59
WILDCARD_PAT@51..52
UNDERSCORE@51..52 "_"
WHITESPACE@52..53 " "

8
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
@ -34,7 +34,7 @@ SOURCE_FILE@0..113
R_PAREN@42..43 ")"
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"
@ -46,7 +46,7 @@ SOURCE_FILE@0..113
R_PAREN@60..61 ")"
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'"
@ -58,7 +58,7 @@ SOURCE_FILE@0..113
R_PAREN@79..80 ")"
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\""

6
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
@ -39,7 +39,7 @@ SOURCE_FILE@0..112
R_PAREN@49..50 ")"
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
@ -58,7 +58,7 @@ SOURCE_FILE@0..112
R_PAREN@76..77 ")"
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

2
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 " "

10
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 " "
@ -33,7 +33,7 @@ SOURCE_FILE@0..167
R_PAREN@40..41 ")"
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 " "
@ -72,7 +72,7 @@ SOURCE_FILE@0..167
R_PAREN@82..83 ")"
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
@ -100,7 +100,7 @@ SOURCE_FILE@0..167
R_PAREN@108..109 ")"
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
@ -130,7 +130,7 @@ SOURCE_FILE@0..167
R_PAREN@136..137 ")"
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

2
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 " "

2
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 " "

6
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 "["
@ -50,7 +50,7 @@ SOURCE_FILE@0..259
R_PAREN@73..74 ")"
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 "["
@ -79,7 +79,7 @@ SOURCE_FILE@0..259
R_PAREN@124..125 ")"
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 "["

8
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
@ -41,7 +41,7 @@ SOURCE_FILE@0..130
R_PAREN@47..48 ")"
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
@ -63,7 +63,7 @@ SOURCE_FILE@0..130
R_PAREN@71..72 ")"
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
@ -84,7 +84,7 @@ SOURCE_FILE@0..130
R_PAREN@95..96 ")"
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

2
crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
View file

@ -1093,7 +1093,7 @@ SOURCE_FILE@0..3813
MATCH_ARM_LIST@1853..1885
L_CURLY@1853..1854 "{"
WHITESPACE@1854..1855 " "
MATCH_ARM@1855..1863
MATCH_ARM@1855..1864
LITERAL_PAT@1855..1856
LITERAL@1855..1856
INT_NUMBER@1855..1856 "1"

12
crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
View file

@ -34,7 +34,7 @@ SOURCE_FILE@0..395
MATCH_ARM_LIST@93..141
L_CURLY@93..94 "{"
WHITESPACE@94..103 "\n "
MATCH_ARM@103..117
MATCH_ARM@103..118
TUPLE_STRUCT_PAT@103..111
PATH@103..107
PATH_SEGMENT@103..107
@ -54,7 +54,7 @@ SOURCE_FILE@0..395
R_PAREN@116..117 ")"
COMMA@117..118 ","
WHITESPACE@118..127 "\n "
MATCH_ARM@127..134
MATCH_ARM@127..135
WILDCARD_PAT@127..128
UNDERSCORE@127..128 "_"
WHITESPACE@128..129 " "
@ -97,7 +97,7 @@ SOURCE_FILE@0..395
MATCH_ARM_LIST@168..222
L_CURLY@168..169 "{"
WHITESPACE@169..178 "\n "
MATCH_ARM@178..198
MATCH_ARM@178..199
TUPLE_STRUCT_PAT@178..192
PATH@178..182
PATH_SEGMENT@178..182
@ -126,7 +126,7 @@ SOURCE_FILE@0..395
R_PAREN@197..198 ")"
COMMA@198..199 ","
WHITESPACE@199..208 "\n "
MATCH_ARM@208..215
MATCH_ARM@208..216
WILDCARD_PAT@208..209
UNDERSCORE@208..209 "_"
WHITESPACE@209..210 " "
@ -171,7 +171,7 @@ SOURCE_FILE@0..395
MATCH_ARM_LIST@247..299
L_CURLY@247..248 "{"
WHITESPACE@248..257 "\n "
MATCH_ARM@257..275
MATCH_ARM@257..276
TUPLE_STRUCT_PAT@257..269
PATH@257..261
PATH@257..258
@ -202,7 +202,7 @@ SOURCE_FILE@0..395
R_PAREN@274..275 ")"
COMMA@275..276 ","
WHITESPACE@276..285 "\n "
MATCH_ARM@285..292
MATCH_ARM@285..293
WILDCARD_PAT@285..286
UNDERSCORE@285..286 "_"
WHITESPACE@286..287 " "