itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-25 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: support folding multiline arg list & fn body in one folding range

Browse Source
This commit is contained in:
Young-Flash 2025-06-21 15:44:52 +08:00
parent c5a1078578
commit 8ac661eaa9
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/ide/src/folding_ranges.rs
View File

@ -47,6 +47,7 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
let mut res = vec![];
let mut visited_comments = FxHashSet::default();
let mut visited_nodes = FxHashSet::default();
let mut merged_fn_bodies = FxHashSet::default();
// regions can be nested, here is a LIFO buffer
let mut region_starts: Vec<TextSize> = vec![];
@ -59,6 +60,31 @@ pub(crate) fn folding_ranges(file: &SourceFile) -> Vec<Fold> {
NodeOrToken::Token(token) => token.text().contains('\n'),
};
if is_multiline {
// for the arg list, we need to special handle
if matches!(element.kind(), ARG_LIST | PARAM_LIST) {
if let NodeOrToken::Node(node) = &element {
if let Some(fn_node) = node.parent().and_then(ast::Fn::cast) {
if let Some(body) = fn_node.body() {
// just add a big fold combine the params and body
res.push(Fold {
range: TextRange::new(
node.text_range().start(),
body.syntax().text_range().end(),
),
kind: FoldKind::ArgList,
});
merged_fn_bodies.insert(body.syntax().text_range());
continue;
}
}
}
}
// skip the merged function body
if matches!(element.kind(), BLOCK_EXPR)
&& merged_fn_bodies.contains(&element.text_range())
{
continue;
}
res.push(Fold { range: element.text_range(), kind });
continue;
}
@ -291,6 +317,7 @@ mod tests {
use super::*;
#[track_caller]
fn check(#[rust_analyzer::rust_fixture] ra_fixture: &str) {
let (ranges, text) = extract_tags(ra_fixture, "fold");
@ -544,7 +571,7 @@ const _: S = S <fold block>{
fn foo<fold arglist>(
x: i32,
y: String,
)</fold> {}
) {}</fold>
"#,
)
}