From 751562d2f77a7bc3eeeffbf8e53c9f3515fa9653 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 6 Sep 2018 01:19:24 +0300
Subject: better introduce

---
 crates/libeditor/src/code_actions.rs | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/crates/libeditor/src/code_actions.rs b/crates/libeditor/src/code_actions.rs
index ebe70681b..4a07d1bc9 100644
--- a/crates/libeditor/src/code_actions.rs
+++ b/crates/libeditor/src/code_actions.rs
@@ -109,17 +109,22 @@ pub fn introduce_variable<'a>(file: &'a File, range: TextRange) -> Option<impl F
     }
     Some(move || {
         let mut buf = String::new();
+        let mut edit = EditBuilder::new();
+
         buf.push_str("let var_name = ");
         expr.syntax().text().push_to(&mut buf);
-        buf.push_str(";");
-        indent.text().push_to(&mut buf);
-
-        let mut edit = EditBuilder::new();
-        edit.replace(expr.syntax().range(), "var_name".to_string());
-        edit.insert(anchor_stmt.syntax().range().start(), buf);
+        if expr.syntax().range().start() == anchor_stmt.syntax().range().start() {
+            edit.replace(expr.syntax().range(), buf);
+        } else {
+            buf.push_str(";");
+            indent.text().push_to(&mut buf);
+            edit.replace(expr.syntax().range(), "var_name".to_string());
+            edit.insert(anchor_stmt.syntax().range().start(), buf);
+        }
+        let cursor_position = anchor_stmt.syntax().range().start() + TextUnit::of_str("let ");
         LocalEdit {
             edit: edit.finish(),
-            cursor_position: Some(anchor_stmt.syntax().range().start() + TextUnit::of_str("let ")),
+            cursor_position: Some(cursor_position),
         }
     })
 }
@@ -183,7 +188,7 @@ mod tests {
     }
 
     #[test]
-    fn test_intrdoduce_var() {
+    fn test_intrdoduce_var_simple() {
         check_action_range(
             "
 fn foo() {
@@ -192,6 +197,19 @@ fn foo() {
 fn foo() {
     let <|>var_name = 1 + 1;
     foo(var_name);
+}",
+            |file, range| introduce_variable(file, range).map(|f| f()),
+        );
+    }
+    #[test]
+    fn test_intrdoduce_var_expr_stmt() {
+check_action_range(
+            "
+fn foo() {
+    <|>1 + 1<|>;
+}", "
+fn foo() {
+    let <|>var_name = 1 + 1;
 }",
             |file, range| introduce_variable(file, range).map(|f| f()),
         );
-- 
cgit v1.2.3