language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move renames into ra_analysis

Browse source
This commit is contained in:
DJMcNab 2018-12-30 18:14:55 +00:00
parent 0f95d8523e
commit c402b007a3
3 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -557,24 +557,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 {