mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lukas Wirth 2023-02-08 12:03:11 +01:00
parent 3c89945e78
commit 5e6208b1df
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 let_stmt(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
if file.syntax().text().slice(offset..expr_range.start()).contains_char('\n') { if file.syntax().text().slice(offset..expr_range.start()).contains_char('\n') {
return None; 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(); let offset = let_stmt.syntax().text_range().end();
Some(TextEdit::insert(offset, ";".to_string())) Some(TextEdit::insert(offset, ";".to_string()))
} }
@ -407,15 +411,14 @@ fn type_char_noop(char_typed: char, ra_fixture_before: &str) {
#[test] #[test]
fn test_semi_after_let() { fn test_semi_after_let() {
// do_check(r" type_char_noop(
// fn foo() { '=',
// let foo =$0 r"
// } fn foo() {
// ", r" let foo =$0
// fn foo() { }
// let foo =; ",
// } );
// ");
type_char( type_char(
'=', '=',
r#" r#"
@ -429,17 +432,25 @@ fn foo() {
} }
"#, "#,
); );
// do_check(r" type_char_noop(
// fn foo() { '=',
// let foo =$0 r#"
// let bar = 1; fn foo() {
// } let difference $0(counts: &HashMap<(char, char), u64>, last: char) -> u64 {
// ", r" // ...
// fn foo() { }
// let foo =; }
// let bar = 1; "#,
// } );
// "); type_char_noop(
'=',
r"
fn foo() {
let foo =$0
let bar = 1;
}
",
);
} }
#[test] #[test]