Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove trailing ; when turning assignment into == comparison

Browse source
This commit is contained in:
Jonas Schievink 2022-04-13 16:01:09 +02:00
parent b9dd7db817
commit 99e9e52fbc
1 changed files with 70 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
crates/ide/src/typing.rs
View file

@ -173,6 +173,9 @@ fn on_eq_typed(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
if let Some(edit) = assign_expr(file, offset) {
return Some(edit);
}
if let Some(edit) = assign_to_eq(file, offset) {
return Some(edit);
}
return None;
@ -182,13 +185,13 @@ fn on_eq_typed(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
return None;
}
// Parent must be `ExprStmt` or `StmtList` for `;` to be valid.
if let Some(expr_stmt) = ast::ExprStmt::cast(binop.syntax().parent()?) {
if expr_stmt.semicolon_token().is_some() {
return None;
}
} else {
if !ast::StmtList::can_cast(binop.syntax().parent()?.kind()) {
// Parent must be `ExprStmt` or `StmtList` for `;` to be valid.
return None;
}
}
@ -205,6 +208,25 @@ fn on_eq_typed(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
Some(TextEdit::insert(offset, ";".to_string()))
}
/// `a =$0 b;` removes the semicolon if an expression is valid in this context.
fn assign_to_eq(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
let binop: ast::BinExpr = find_node_at_offset(file.syntax(), offset)?;
if !matches!(binop.op_kind(), Some(ast::BinaryOp::CmpOp(ast::CmpOp::Eq { negated: false })))
{
return None;
}
let expr_stmt = ast::ExprStmt::cast(binop.syntax().parent()?)?;
let semi = expr_stmt.semicolon_token()?;
if expr_stmt.syntax().next_sibling().is_some() {
// Not the last statement in the list.
return None;
}
Some(TextEdit::delete(semi.text_range()))
}
fn let_stmt(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
let let_stmt: ast::LetStmt = find_node_at_offset(file.syntax(), offset)?;
if let_stmt.semicolon_token().is_some() {
@ -424,6 +446,53 @@ fn f() {
);
}
#[test]
fn assign_to_eq() {
type_char(
'=',
r#"
fn f(a: u8) {
a =$0 0;
}
"#,
r#"
fn f(a: u8) {
a == 0
}
"#,
);
type_char(
'=',
r#"
fn f(a: u8) {
a $0= 0;
}
"#,
r#"
fn f(a: u8) {
a == 0
}
"#,
);
type_char_noop(
'=',
r#"
fn f(a: u8) {
let e = a =$0 0;
}
"#,
);
type_char_noop(
'=',
r#"
fn f(a: u8) {
let e = a =$0 0;
e
}
"#,
);
}
#[test]
fn indents_new_chain_call() {
type_char(