fix comments

diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index b52a3f4d5d91b2765d8efb26db679e90c0d214ff..fa79908a1bd27ef599612698b52ce46dc9a92b60 100644 (file)
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -19,7 +19,6 @@
     CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit,
     Query, RootChange, SourceChange, SourceFileEdit,
     symbol_index::{FileSymbol, LibrarySymbolsQuery},
-    rename::rename
 };
 
 impl db::RootDatabase {
@@ -232,10 +231,6 @@ pub(crate) fn assists(&self, frange: FileRange) -> Vec<SourceChange> {
             .collect()
     }
 
-    pub(crate) fn rename(&self, position: FilePosition, new_name: &str) -> Option<SourceChange> {
-        rename(self, position, new_name)
-    }
-
     pub(crate) fn index_resolve(&self, name_ref: &ast::NameRef) -> Vec<FileSymbol> {
         let name = name_ref.text();
         let mut query = Query::new(name.to_string());

diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 1845bf4430b2b3cafe69973b1d553e0a19e3a788..33bef178a9a1bcb23b50154d96d15ed29173c700 100644 (file)
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -466,7 +466,7 @@ pub fn rename(
         position: FilePosition,
         new_name: &str,
     ) -> Cancelable<Option<SourceChange>> {
-        self.with_db(|db| db.rename(position, new_name))
+        self.with_db(|db| rename::rename(db, position, new_name))
     }
 
     fn with_db<F: FnOnce(&db::RootDatabase) -> T + std::panic::UnwindSafe, T>(

diff --git a/crates/ra_ide_api/src/rename.rs b/crates/ra_ide_api/src/rename.rs
index 9f8a00ae7503f523251d8a922ed53c28567b4b69..9ab6f2a774bd23be994922f6688b575f4d31ade9 100644 (file)
--- a/crates/ra_ide_api/src/rename.rs
+++ b/crates/ra_ide_api/src/rename.rs
@@ -40,9 +40,7 @@ fn find_name_and_module_at_offset(
     position: FilePosition,
 ) -> Option<(&ast::Name, &ast::Module)> {
     let ast_name = find_node_at_offset::<ast::Name>(syntax, position.offset);
-    let ast_name_parent = ast_name
-        .and_then(|n| n.syntax().parent())
-        .and_then(|p| ast::Module::cast(p));
+    let ast_name_parent = ast::Module::cast(ast_name?.syntax().parent()?);
 
     if let (Some(ast_module), Some(name)) = (ast_name_parent, ast_name) {
         return Some((name, ast_module));

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index c010a6ddf5e0c45ef9b852ba35ee14b75be03b18..9cdca82c4feb77605569d048384e3e73768fd546 100644 (file)
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -5,7 +5,7 @@
     FoldingRangeKind, FoldingRangeParams, Hover, HoverContents, Location, MarkupContent,
     MarkupKind, ParameterInformation, ParameterLabel, Position, PrepareRenameResponse, Range,
     RenameParams, SignatureInformation, SymbolInformation, TextDocumentIdentifier, TextEdit,
-    WorkspaceEdit, DocumentChanges, TextDocumentEdit, DocumentChangeOperation, ResourceOp
+    WorkspaceEdit
 };
 use ra_ide_api::{
     FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo, RunnableKind, Severity,
@@ -472,37 +472,9 @@ pub fn handle_rename(world: ServerWorld, params: RenameParams) -> Result<Option<
         return Ok(None);
     }
 
-    let mut source_change = change.unwrap();
-    let text_document_edits = source_change
-        .source_file_edits
-        .drain(..)
-        .into_iter()
-        .map(|e| e.try_conv_with(&world))
-        .collect::<Result<Vec<TextDocumentEdit>>>();
-
-    let text_document_ops = source_change
-        .file_system_edits
-        .drain(..)
-        .into_iter()
-        .map(|e| e.try_conv_with(&world))
-        .collect::<Result<Vec<ResourceOp>>>();
-
-    let mut document_changes = Vec::new();
-    document_changes.extend(
-        text_document_edits?
-            .into_iter()
-            .map(DocumentChangeOperation::Edit),
-    );
-    document_changes.extend(
-        text_document_ops?
-            .into_iter()
-            .map(DocumentChangeOperation::Op),
-    );
+    let source_change_req = change.unwrap().try_conv_with(&world)?;
 
-    Ok(Some(WorkspaceEdit {
-        changes: None,
-        document_changes: Some(DocumentChanges::Operations(document_changes)),
-    }))
+    Ok(Some(source_change_req.workspace_edit))
 }
 
 pub fn handle_references(