nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14103 - Veykril:typing-semi, r=Veykril

Browse Source 
fix: Don't insert a semicolon when typing = if parse errors are encountered

Fixes https://github.com/rust-lang/rust-analyzer/issues/11005
This commit is contained in:
bors 2023-02-08 11:14:58 +00:00
commit 5341a6fa7f
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
crates/ide/src/typing.rs
View File

@ -253,6 +253,10 @@ fn on_eq_typed(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
if file.syntax().text().slice(offset..expr_range.start()).contains_char('\n') {
return None;
}
// Good indicator that we will insert into a bad spot, so bail out.
if expr.syntax().descendants().any(|it| it.kind() == SyntaxKind::ERROR) {
return None;
}
let offset = let_stmt.syntax().text_range().end();
Some(TextEdit::insert(offset, ";".to_string()))
}
@ -407,15 +411,14 @@ mod tests {
#[test]
fn test_semi_after_let() {
// do_check(r"
// fn foo() {
// let foo =$0
// }
// ", r"
// fn foo() {
// let foo =;
// }
// ");
type_char_noop(
'=',
r"
fn foo() {
let foo =$0
}
",
);
type_char(
'=',
r#"
@ -429,17 +432,25 @@ fn foo() {
}
"#,
);
// do_check(r"
// fn foo() {
// let foo =$0
// let bar = 1;
// }
// ", r"
// fn foo() {
// let foo =;
// let bar = 1;
// }
// ");
type_char_noop(
'=',
r#"
fn foo() {
let difference $0(counts: &HashMap<(char, char), u64>, last: char) -> u64 {
// ...
}
}
"#,
);
type_char_noop(
'=',
r"
fn foo() {
let foo =$0
let bar = 1;
}
",
);
}
#[test]