squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #1873

Browse source 
1873: `fold_kind`: `MATCH_ARM_LIST => FoldKind::Block` r=matklad a=Centril

As suggested by @matklad in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/folding.20of.20.60match.60.20and.20.60if.60/near/176109093.

This should let folks fold all the arms in a `match` expression rather than just each arm individually.

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>
This commit is contained in:
bors[bot] 2019-09-19 15:56:38 +00:00 committed by GitHub
parent 4eb0bb4810 2be9031935
commit 44bab3621d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_ide_api/src/folding_ranges.rs
View file

@ -87,6 +87,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
| EXTERN_ITEM_LIST
| USE_TREE_LIST
| BLOCK
| MATCH_ARM_LIST
| ENUM_VARIANT_LIST
| TOKEN_TREE => Some(FoldKind::Block),
_ => None,
@ -358,4 +359,18 @@ macro_rules! foo <fold>{
let folds = &[FoldKind::Block];
do_check(text, folds);
}
#[test]
fn test_fold_match_arms() {
let text = r#"
fn main() <fold>{
match 0 <fold>{
0 => 0,
_ => 1,
}</fold>
}</fold>"#;
let folds = &[FoldKind::Block, FoldKind::Block];
do_check(text, folds);
}
}