12 files changed, 144 insertions, 71 deletions

diff --git a/crates/gen_lsp_server/Cargo.toml b/crates/gen_lsp_server/Cargo.toml
index 2aee4ea16..a421a3e0b 100644
--- a/crates/gen_lsp_server/Cargo.toml
+++ b/crates/gen_lsp_server/Cargo.toml
@@ -10,7 +10,7 @@ description = "Generic LSP server scaffold."
 [dependencies]
 languageserver-types = "0.53.1"
 log = "0.4.3"
-failure = "0.1.2"
-serde_json = "1.0.24"
+failure = "0.1.4"
+serde_json = "1.0.34"
 serde = { version = "1.0.83", features = ["derive"] }
 crossbeam-channel = "0.3.5"
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index bff2e00c9..5ed374c79 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -288,7 +288,11 @@ impl AnalysisImpl {
             Some(it) => it,
         };
 
-        let mut ret = vec![(position.file_id, binding.syntax().range())];
+        let mut ret = binding
+            .name()
+            .into_iter()
+            .map(|name| (position.file_id, name.syntax().range()))
+            .collect::<Vec<_>>();
         ret.extend(
             descr
                 .scopes(&*self.db)
@@ -505,7 +509,25 @@ impl AnalysisImpl {
         let infer = function.infer(&*self.db)?;
         Ok(infer.type_of_node(node).map(|t| t.to_string()))
     }
-
+    pub fn rename(
+        &self,
+        position: FilePosition,
+        new_name: &str,
+    ) -> Cancelable<Vec<SourceFileEdit>> {
+        let res = self
+            .find_all_refs(position)?
+            .iter()
+            .map(|(file_id, text_range)| SourceFileEdit {
+                file_id: *file_id,
+                edit: {
+                    let mut builder = ra_text_edit::TextEditBuilder::new();
+                    builder.replace(*text_range, new_name.into());
+                    builder.finish()
+                },
+            })
+            .collect::<Vec<_>>();
+        Ok(res)
+    }
     fn index_resolve(&self, name_ref: ast::NameRef) -> Cancelable<Vec<(FileId, FileSymbol)>> {
         let name = name_ref.text();
         let mut query = Query::new(name.to_string());
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index 9f5e9f358..e56168510 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -367,6 +367,13 @@ impl Analysis {
     pub fn type_of(&self, frange: FileRange) -> Cancelable<Option<String>> {
         self.imp.type_of(frange)
     }
+    pub fn rename(
+        &self,
+        position: FilePosition,
+        new_name: &str,
+    ) -> Cancelable<Vec<SourceFileEdit>> {
+        self.imp.rename(position, new_name)
+    }
 }
 
 pub struct LibraryData {
diff --git a/crates/ra_analysis/tests/tests.rs b/crates/ra_analysis/tests/tests.rs
index 210fa2a13..a314fbc40 100644
--- a/crates/ra_analysis/tests/tests.rs
+++ b/crates/ra_analysis/tests/tests.rs
@@ -1,5 +1,5 @@
 use ra_syntax::TextRange;
-use test_utils::assert_eq_dbg;
+use test_utils::{assert_eq_dbg, assert_eq_text};
 
 use ra_analysis::{
     mock_analysis::{analysis_and_position, single_file, single_file_with_position, MockAnalysis},
@@ -453,3 +453,94 @@ fn test_find_all_refs_for_fn_param() {
     let refs = get_all_refs(code);
     assert_eq!(refs.len(), 2);
 }
+#[test]
+fn test_rename_for_local() {
+    test_rename(
+        r#"
+    fn main() {
+        let mut i = 1;
+        let j = 1;
+        i = i<|> + j;
+
+        {
+            i = 0;
+        }
+
+        i = 5;
+    }"#,
+        "k",
+        r#"
+    fn main() {
+        let mut k = 1;
+        let j = 1;
+        k = k + j;
+
+        {
+            k = 0;
+        }
+
+        k = 5;
+    }"#,
+    );
+}
+
+#[test]
+fn test_rename_for_param_inside() {
+    test_rename(
+        r#"
+    fn foo(i : u32) -> u32 {
+        i<|>
+    }"#,
+        "j",
+        r#"
+    fn foo(j : u32) -> u32 {
+        j
+    }"#,
+    );
+}
+
+#[test]
+fn test_rename_refs_for_fn_param() {
+    test_rename(
+        r#"
+    fn foo(i<|> : u32) -> u32 {
+        i
+    }"#,
+        "new_name",
+        r#"
+    fn foo(new_name : u32) -> u32 {
+        new_name
+    }"#,
+    );
+}
+
+#[test]
+fn test_rename_for_mut_param() {
+    test_rename(
+        r#"
+    fn foo(mut i<|> : u32) -> u32 {
+        i
+    }"#,
+        "new_name",
+        r#"
+    fn foo(mut new_name : u32) -> u32 {
+        new_name
+    }"#,
+    );
+}
+fn test_rename(text: &str, new_name: &str, expected: &str) {
+    let (analysis, position) = single_file_with_position(text);
+    let edits = analysis.rename(position, new_name).unwrap();
+    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::new();
+    let mut file_id: Option<FileId> = None;
+    for edit in edits {
+        file_id = Some(edit.file_id);
+        for atom in edit.edit.as_atoms() {
+            text_edit_bulder.replace(atom.delete, atom.insert.clone());
+        }
+    }
+    let result = text_edit_bulder
+        .finish()
+        .apply(&*analysis.file_text(file_id.unwrap()));
+    assert_eq_text!(expected, &*result);
+}
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 0b8d6f3dd..83f1d91e0 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 clap = "2.32.0"
-failure = "0.1.1"
+failure = "0.1.4"
 join_to_string = "0.1.1"
 ra_syntax = { path = "../ra_syntax" }
 ra_editor = { path = "../ra_editor" }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 75bcf2b39..ecc56d953 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
 
 [dependencies]
-backtrace = "0.3.1"
 relative-path = "0.4.0"
 salsa = "0.9.0"
 rustc-hash = "1.0"
diff --git a/crates/ra_db/src/cancelation.rs b/crates/ra_db/src/cancelation.rs
index 73444b015..56ce27bff 100644
--- a/crates/ra_db/src/cancelation.rs
+++ b/crates/ra_db/src/cancelation.rs
@@ -15,29 +15,17 @@
 //! any background processing (this bit is handled by salsa, see
 //! `BaseDatabase::check_canceled` method).
 
-use std::{
-    cmp,
-    hash::{Hash, Hasher},
-    sync::Arc,
-};
-
-use backtrace::Backtrace;
-use parking_lot::Mutex;
-
 /// An "error" signifing that the operation was canceled.
-#[derive(Clone)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub struct Canceled {
-    backtrace: Arc<Mutex<Backtrace>>,
+    _private: (),
 }
 
 pub type Cancelable<T> = Result<T, Canceled>;
 
 impl Canceled {
     pub(crate) fn new() -> Canceled {
-        let bt = Backtrace::new_unresolved();
-        Canceled {
-            backtrace: Arc::new(Mutex::new(bt)),
-        }
+        Canceled { _private: () }
     }
 }
 
@@ -49,37 +37,8 @@ impl std::fmt::Display for Canceled {
 
 impl std::fmt::Debug for Canceled {
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut bt = self.backtrace.lock();
-        let bt: &mut Backtrace = &mut *bt;
-        bt.resolve();
-        write!(fmt, "canceled at:\n{:?}", bt)
+        write!(fmt, "Canceled")
     }
 }
 
 impl std::error::Error for Canceled {}
-
-impl PartialEq for Canceled {
-    fn eq(&self, _: &Canceled) -> bool {
-        true
-    }
-}
-
-impl Eq for Canceled {}
-
-impl Hash for Canceled {
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        ().hash(hasher)
-    }
-}
-
-impl cmp::Ord for Canceled {
-    fn cmp(&self, _: &Canceled) -> cmp::Ordering {
-        cmp::Ordering::Equal
-    }
-}
-
-impl cmp::PartialOrd for Canceled {
-    fn partial_cmp(&self, other: &Canceled) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 22a26b844..8bd4caa53 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -8,9 +8,9 @@ authors = ["Aleksey Kladov <[email protected]>"]
 rayon = "1.0.2"
 threadpool = "1.7.1"
 relative-path = "0.4.0"
-failure = "0.1.2"
-failure_derive = "0.1.2"
-serde_json = "1.0.24"
+failure = "0.1.4"
+failure_derive = "0.1.4"
+serde_json = "1.0.34"
 serde = "1.0.83"
 drop_bomb = "0.1.0"
 crossbeam-channel = "0.3.5"
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 46b48830d..06dd373c0 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -433,7 +433,7 @@ impl<'a> PoolDispatcher<'a> {
                                     RawResponse::err(
                                         id,
                                         ErrorCode::ContentModified as i32,
-                                        format!("content modified: {:?}", e),
+                                        "content modified".to_string(),
                                     )
                                 } else {
                                     RawResponse::err(
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 228eb7ce5..012f74270 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -556,24 +556,19 @@ pub fn handle_rename(world: ServerWorld, params: RenameParams) -> Result<Option<
         .into());
     }
 
-    let refs = world
+    let renames = world
         .analysis()
-        .find_all_refs(FilePosition { file_id, offset })?;
-    if refs.is_empty() {
+        .rename(FilePosition { file_id, offset }, &*params.new_name)?;
+    if renames.is_empty() {
         return Ok(None);
     }
 
     let mut changes = HashMap::new();
-    for r in refs {
-        if let Ok(loc) = to_location(r.0, r.1, &world, &line_index) {
-            changes
-                .entry(loc.uri)
-                .or_insert_with(Vec::new)
-                .push(TextEdit {
-                    range: loc.range,
-                    new_text: params.new_name.clone(),
-                });
-        }
+    for edit in renames {
+        changes
+            .entry(file_id.try_conv_with(&world)?)
+            .or_insert_with(Vec::new)
+            .extend(edit.edit.conv_with(&line_index));
     }
 
     Ok(Some(WorkspaceEdit {
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
index 02727993e..963491128 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test_utils/Cargo.toml
@@ -8,4 +8,4 @@ authors = ["Aleksey Kladov <[email protected]>"]
 difference = "2.0.0"
 itertools = "0.8.0"
 text_unit = "0.1.2"
-serde_json = "1.0.24"
+serde_json = "1.0.34"
diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml
index 4795b1387..9d6707a59 100644
--- a/crates/tools/Cargo.toml
+++ b/crates/tools/Cargo.toml
@@ -10,4 +10,4 @@ teraron = "0.0.1"
 walkdir = "2.1.3"
 itertools = "0.8.0"
 clap = "2.32.0"
-failure = "0.1.1"
+failure = "0.1.4"