language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

don't remove the comment token if it's last

Browse source
This commit is contained in:
Jeroen Vannevel 2022-01-19 23:26:30 +00:00
parent 4f3dd5bc08
commit 50c913c733
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ide_assists/src/handlers/extract_function.rs
View file

@ -1467,6 +1467,7 @@ fn make_body(
.filter(|it| text_range.contains_range(it.text_range())) .filter(|it| text_range.contains_range(it.text_range()))
.map(|it| match it { .map(|it| match it {
syntax::NodeOrToken::Node(n) => { syntax::NodeOrToken::Node(n) => {
println!("Found node: {:?}", n);
return syntax::NodeOrToken::try_from(rewrite_body_segment( return syntax::NodeOrToken::try_from(rewrite_body_segment(
ctx, ctx,
&fun.params, &fun.params,
@ -1476,6 +1477,7 @@ fn make_body(
.unwrap() .unwrap()
} }
syntax::NodeOrToken::Token(t) => { syntax::NodeOrToken::Token(t) => {
println!("Found token: {:?}", t);
return syntax::NodeOrToken::try_from(t).unwrap() return syntax::NodeOrToken::try_from(t).unwrap()
} }
}) })
@ -1487,7 +1489,11 @@ fn make_body(
elements.push(node); elements.push(node);
None None
}) })
} },
Some(token) if token.as_token().is_some() && token.as_token().unwrap().kind() == COMMENT => {
elements.push(token);
None
},
_ => None, _ => None,
}; };