itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18587 from Veykril/push-urrlrursyrws

Browse Source 
fix: Fix syntax fixup inserting unnecessary semicolons
This commit is contained in:
Lukas Wirth 2024-12-02 12:50:28 +00:00 committed by GitHub
commit 8762a4f9be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/hir-expand/src/fixup.rs
View File

@ -110,7 +110,8 @@ pub(crate) fn fixup_syntax(
}
},
ast::ExprStmt(it) => {
if it.semicolon_token().is_none() {
let needs_semi = it.semicolon_token().is_none() && it.expr().map_or(false, |e| e.syntax().kind() != SyntaxKind::BLOCK_EXPR);
if needs_semi {
append.insert(node.clone().into(), vec![
Leaf::Punct(Punct {
char: ';',
@ -905,6 +906,21 @@ fn foo() {
"#,
expect![[r#"
fn foo () {|| __ra_fixup}
"#]],
);
}
#[test]
fn fixup_regression_() {
check(
r#"
fn foo() {
{}
{}
}
"#,
expect![[r#"
fn foo () {{} {}}
"#]],
);
}