4 files changed, 443 insertions, 88 deletions

diff --git a/crates/ra_assists/src/flip_binexpr.rs b/crates/ra_assists/src/flip_binexpr.rs
new file mode 100644
index 000000000..ec377642e
--- /dev/null
+++ b/crates/ra_assists/src/flip_binexpr.rs
@@ -0,0 +1,141 @@
+use hir::db::HirDatabase;
+use ra_syntax::ast::{AstNode, BinExpr, BinOp};
+
+use crate::{AssistCtx, Assist, AssistId};
+
+/// Flip binary expression assist.
+pub(crate) fn flip_binexpr(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let expr = ctx.node_at_offset::<BinExpr>()?;
+    let lhs = expr.lhs()?.syntax();
+    let rhs = expr.rhs()?.syntax();
+    let op_range = expr.op()?.range();
+    // The assist should be applied only if the cursor is on the operator
+    let cursor_in_range = ctx.frange.range.is_subrange(&op_range);
+    if !cursor_in_range {
+        return None;
+    }
+    let action: FlipAction = expr.op_kind()?.into();
+    // The assist should not be applied for certain operators
+    if let FlipAction::DontFlip = action {
+        return None;
+    }
+
+    ctx.add_action(AssistId("flip_binexpr"), "flip binary expression", |edit| {
+        edit.target(op_range);
+        if let FlipAction::FlipAndReplaceOp(new_op) = action {
+            edit.replace(op_range, new_op);
+        }
+        edit.replace(lhs.range(), rhs.text());
+        edit.replace(rhs.range(), lhs.text());
+    });
+
+    ctx.build()
+}
+
+enum FlipAction {
+    // Flip the expression
+    Flip,
+    // Flip the expression and replace the operator with this string
+    FlipAndReplaceOp(&'static str),
+    // Do not flip the expression
+    DontFlip,
+}
+
+impl From<BinOp> for FlipAction {
+    fn from(op_kind: BinOp) -> Self {
+        match op_kind {
+            BinOp::Assignment => FlipAction::DontFlip,
+            BinOp::AddAssign => FlipAction::DontFlip,
+            BinOp::DivAssign => FlipAction::DontFlip,
+            BinOp::MulAssign => FlipAction::DontFlip,
+            BinOp::RemAssign => FlipAction::DontFlip,
+            BinOp::ShrAssign => FlipAction::DontFlip,
+            BinOp::ShlAssign => FlipAction::DontFlip,
+            BinOp::SubAssign => FlipAction::DontFlip,
+            BinOp::BitOrAssign => FlipAction::DontFlip,
+            BinOp::BitAndAssign => FlipAction::DontFlip,
+            BinOp::BitXorAssign => FlipAction::DontFlip,
+            BinOp::GreaterTest => FlipAction::FlipAndReplaceOp("<"),
+            BinOp::GreaterEqualTest => FlipAction::FlipAndReplaceOp("<="),
+            BinOp::LesserTest => FlipAction::FlipAndReplaceOp(">"),
+            BinOp::LesserEqualTest => FlipAction::FlipAndReplaceOp(">="),
+            _ => FlipAction::Flip,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use crate::helpers::{ check_assist, check_assist_target, check_assist_not_applicable };
+
+    #[test]
+    fn flip_binexpr_target_is_the_op() {
+        check_assist_target(flip_binexpr, "fn f() { let res = 1 ==<|> 2; }", "==")
+    }
+
+    #[test]
+    fn flip_binexpr_not_applicable_for_assignment() {
+        check_assist_not_applicable(flip_binexpr, "fn f() { let mut _x = 1; _x +=<|> 2 }")
+    }
+
+    #[test]
+    fn flip_binexpr_works_for_eq() {
+        check_assist(
+            flip_binexpr,
+            "fn f() { let res = 1 ==<|> 2; }",
+            "fn f() { let res = 2 ==<|> 1; }",
+        )
+    }
+
+    #[test]
+    fn flip_binexpr_works_for_gt() {
+        check_assist(
+            flip_binexpr,
+            "fn f() { let res = 1 ><|> 2; }",
+            "fn f() { let res = 2 <<|> 1; }",
+        )
+    }
+
+    #[test]
+    fn flip_binexpr_works_for_lteq() {
+        check_assist(
+            flip_binexpr,
+            "fn f() { let res = 1 <=<|> 2; }",
+            "fn f() { let res = 2 >=<|> 1; }",
+        )
+    }
+
+    #[test]
+    fn flip_binexpr_works_for_complex_expr() {
+        check_assist(
+            flip_binexpr,
+            "fn f() { let res = (1 + 1) ==<|> (2 + 2); }",
+            "fn f() { let res = (2 + 2) ==<|> (1 + 1); }",
+        )
+    }
+
+    #[test]
+    fn flip_binexpr_works_inside_match() {
+        check_assist(
+            flip_binexpr,
+            r#"
+            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
+                match other.downcast_ref::<Self>() {
+                    None => false,
+                    Some(it) => it ==<|> self,
+                }
+            }
+            "#,
+            r#"
+            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
+                match other.downcast_ref::<Self>() {
+                    None => false,
+                    Some(it) => self ==<|> it,
+                }
+            }
+            "#,
+        )
+    }
+}
diff --git a/crates/ra_assists/src/flip_eq_operands.rs b/crates/ra_assists/src/flip_eq_operands.rs
deleted file mode 100644
index df0bb689d..000000000
--- a/crates/ra_assists/src/flip_eq_operands.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use hir::db::HirDatabase;
-use ra_syntax::ast::{AstNode, BinExpr, BinOp};
-
-use crate::{AssistCtx, Assist, AssistId};
-
-pub(crate) fn flip_eq_operands(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
-    let expr = ctx.node_at_offset::<BinExpr>()?;
-    let lhs = expr.lhs()?.syntax();
-    let rhs = expr.rhs()?.syntax();
-    let op_range = expr.op()?.range();
-    let cursor_in_range = ctx.frange.range.is_subrange(&op_range);
-    let allowed_ops = [BinOp::EqualityTest, BinOp::NegatedEqualityTest];
-    let expr_op = expr.op_kind()?;
-    if !cursor_in_range || !allowed_ops.iter().any(|o| *o == expr_op) {
-        return None;
-    }
-    ctx.add_action(AssistId("flip_eq_operands"), "flip equality operands", |edit| {
-        edit.target(op_range);
-        edit.replace(lhs.range(), rhs.text());
-        edit.replace(rhs.range(), lhs.text());
-    });
-
-    ctx.build()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::helpers::{check_assist, check_assist_target};
-
-    #[test]
-    fn flip_eq_operands_for_simple_stmt() {
-        check_assist(
-            flip_eq_operands,
-            "fn f() { let res = 1 ==<|> 2; }",
-            "fn f() { let res = 2 ==<|> 1; }",
-        )
-    }
-
-    #[test]
-    fn flip_neq_operands_for_simple_stmt() {
-        check_assist(
-            flip_eq_operands,
-            "fn f() { let res = 1 !=<|> 2; }",
-            "fn f() { let res = 2 !=<|> 1; }",
-        )
-    }
-
-    #[test]
-    fn flip_eq_operands_for_complex_stmt() {
-        check_assist(
-            flip_eq_operands,
-            "fn f() { let res = (1 + 1) ==<|> (2 + 2); }",
-            "fn f() { let res = (2 + 2) ==<|> (1 + 1); }",
-        )
-    }
-
-    #[test]
-    fn flip_eq_operands_in_match_expr() {
-        check_assist(
-            flip_eq_operands,
-            r#"
-            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
-                match other.downcast_ref::<Self>() {
-                    None => false,
-                    Some(it) => it ==<|> self,
-                }
-            }
-            "#,
-            r#"
-            fn dyn_eq(&self, other: &dyn Diagnostic) -> bool {
-                match other.downcast_ref::<Self>() {
-                    None => false,
-                    Some(it) => self ==<|> it,
-                }
-            }
-            "#,
-        )
-    }
-
-    #[test]
-    fn flip_eq_operands_target() {
-        check_assist_target(flip_eq_operands, "fn f() { let res = 1 ==<|> 2; }", "==")
-    }
-}
diff --git a/crates/ra_assists/src/inline_local_variable.rs b/crates/ra_assists/src/inline_local_variable.rs
new file mode 100644
index 000000000..bd3cdb970
--- /dev/null
+++ b/crates/ra_assists/src/inline_local_variable.rs
@@ -0,0 +1,298 @@
+use hir::db::HirDatabase;
+use hir::source_binder::function_from_child_node;
+use ra_syntax::{ast::{self, AstNode}, TextRange};
+use ra_syntax::ast::{PatKind, ExprKind};
+
+use crate::{Assist, AssistCtx, AssistId};
+use crate::assist_ctx::AssistBuilder;
+
+pub(crate) fn inline_local_varialbe(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
+    let let_stmt = ctx.node_at_offset::<ast::LetStmt>()?;
+    let bind_pat = match let_stmt.pat()?.kind() {
+        PatKind::BindPat(pat) => pat,
+        _ => return None,
+    };
+    if bind_pat.is_mutable() {
+        return None;
+    }
+    let initializer = let_stmt.initializer()?;
+    let wrap_in_parens = match initializer.kind() {
+        ExprKind::LambdaExpr(_)
+        | ExprKind::IfExpr(_)
+        | ExprKind::LoopExpr(_)
+        | ExprKind::ForExpr(_)
+        | ExprKind::WhileExpr(_)
+        | ExprKind::ContinueExpr(_)
+        | ExprKind::BreakExpr(_)
+        | ExprKind::Label(_)
+        | ExprKind::ReturnExpr(_)
+        | ExprKind::MatchExpr(_)
+        | ExprKind::StructLit(_)
+        | ExprKind::CastExpr(_)
+        | ExprKind::PrefixExpr(_)
+        | ExprKind::RangeExpr(_)
+        | ExprKind::BinExpr(_) => true,
+        ExprKind::CallExpr(_)
+        | ExprKind::IndexExpr(_)
+        | ExprKind::MethodCallExpr(_)
+        | ExprKind::FieldExpr(_)
+        | ExprKind::TryExpr(_)
+        | ExprKind::RefExpr(_)
+        | ExprKind::Literal(_)
+        | ExprKind::TupleExpr(_)
+        | ExprKind::ArrayExpr(_)
+        | ExprKind::ParenExpr(_)
+        | ExprKind::PathExpr(_)
+        | ExprKind::BlockExpr(_) => false,
+    };
+
+    let delete_range = if let Some(whitespace) =
+        let_stmt.syntax().next_sibling().and_then(ast::Whitespace::cast)
+    {
+        TextRange::from_to(let_stmt.syntax().range().start(), whitespace.syntax().range().end())
+    } else {
+        let_stmt.syntax().range()
+    };
+
+    let init_str = if wrap_in_parens {
+        format!("({})", initializer.syntax().text().to_string())
+    } else {
+        initializer.syntax().text().to_string()
+    };
+    let function = function_from_child_node(ctx.db, ctx.frange.file_id, bind_pat.syntax())?;
+    let scope = function.scopes(ctx.db);
+    let refs = scope.find_all_refs(bind_pat);
+
+    ctx.add_action(
+        AssistId("inline_local_variable"),
+        "inline local variable",
+        move |edit: &mut AssistBuilder| {
+            edit.delete(delete_range);
+            for desc in refs {
+                edit.replace(desc.range, init_str.clone())
+            }
+            edit.set_cursor(delete_range.start())
+        },
+    );
+
+    ctx.build()
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::helpers::{check_assist, check_assist_not_applicable};
+
+    use super::*;
+
+    #[test]
+    fn test_inline_let_bind_literal_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn bar(a: usize) {}
+fn foo() {
+    let a<|> = 1;
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn bar(a: usize) {}
+fn foo() {
+    <|>1 + 1;
+    if 1 > 10 {
+    }
+
+    while 1 > 10 {
+
+    }
+    let b = 1 * 10;
+    bar(1);
+}",
+        );
+    }
+
+    #[test]
+    fn test_inline_let_bind_bin_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn bar(a: usize) {}
+fn foo() {
+    let a<|> = 1 + 1;
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn bar(a: usize) {}
+fn foo() {
+    <|>(1 + 1) + 1;
+    if (1 + 1) > 10 {
+    }
+
+    while (1 + 1) > 10 {
+
+    }
+    let b = (1 + 1) * 10;
+    bar((1 + 1));
+}",
+        );
+    }
+
+    #[test]
+    fn test_inline_let_bind_function_call_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn bar(a: usize) {}
+fn foo() {
+    let a<|> = bar(1);
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn bar(a: usize) {}
+fn foo() {
+    <|>bar(1) + 1;
+    if bar(1) > 10 {
+    }
+
+    while bar(1) > 10 {
+
+    }
+    let b = bar(1) * 10;
+    bar(bar(1));
+}",
+        );
+    }
+
+    #[test]
+    fn test_inline_let_bind_cast_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn bar(a: usize): usize { a }
+fn foo() {
+    let a<|> = bar(1) as u64;
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn bar(a: usize): usize { a }
+fn foo() {
+    <|>(bar(1) as u64) + 1;
+    if (bar(1) as u64) > 10 {
+    }
+
+    while (bar(1) as u64) > 10 {
+
+    }
+    let b = (bar(1) as u64) * 10;
+    bar((bar(1) as u64));
+}",
+        );
+    }
+
+    #[test]
+    fn test_inline_let_bind_block_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn foo() {
+    let a<|> = { 10 + 1 };
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn foo() {
+    <|>{ 10 + 1 } + 1;
+    if { 10 + 1 } > 10 {
+    }
+
+    while { 10 + 1 } > 10 {
+
+    }
+    let b = { 10 + 1 } * 10;
+    bar({ 10 + 1 });
+}",
+        );
+    }
+
+    #[test]
+    fn test_inline_let_bind_paren_expr() {
+        check_assist(
+            inline_local_varialbe,
+            "
+fn foo() {
+    let a<|> = ( 10 + 1 );
+    a + 1;
+    if a > 10 {
+    }
+
+    while a > 10 {
+
+    }
+    let b = a * 10;
+    bar(a);
+}",
+            "
+fn foo() {
+    <|>( 10 + 1 ) + 1;
+    if ( 10 + 1 ) > 10 {
+    }
+
+    while ( 10 + 1 ) > 10 {
+
+    }
+    let b = ( 10 + 1 ) * 10;
+    bar(( 10 + 1 ));
+}",
+        );
+    }
+
+    #[test]
+    fn test_not_inline_mut_variable() {
+        check_assist_not_applicable(
+            inline_local_varialbe,
+            "
+fn foo() {
+    let mut a<|> = 1 + 1;
+    a + 1;
+}",
+        );
+    }
+}
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 8900fbc4b..c1514f8e5 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -88,11 +88,12 @@ where
 mod add_derive;
 mod add_impl;
 mod flip_comma;
-mod flip_eq_operands;
+mod flip_binexpr;
 mod change_visibility;
 mod fill_match_arms;
 mod fill_struct_fields;
 mod introduce_variable;
+mod inline_local_variable;
 mod replace_if_let_with_match;
 mod split_import;
 mod remove_dbg;
@@ -107,7 +108,7 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis
         fill_match_arms::fill_match_arms,
         fill_struct_fields::fill_struct_fields,
         flip_comma::flip_comma,
-        flip_eq_operands::flip_eq_operands,
+        flip_binexpr::flip_binexpr,
         introduce_variable::introduce_variable,
         replace_if_let_with_match::replace_if_let_with_match,
         split_import::split_import,
@@ -115,6 +116,7 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis
         auto_import::auto_import,
         add_missing_impl_members::add_missing_impl_members,
         add_missing_impl_members::add_missing_default_members,
+        inline_local_variable::inline_local_varialbe,
     ]
 }