Merge #8119

8119:  Don't return a SourceChange on WillRenameFiles when nothing gets refactored r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <[email protected]>

Author: bors[bot]

crates/ide_assists/src/handlers/add_lifetime_to_type.rs

@@ -29,8 +29,7 @@ pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext) -> Op
     let node = ctx.find_node_at_offset::<ast::Adt>()?;
     let has_lifetime = node
         .generic_param_list()
-        .map(|gen_list| gen_list.lifetime_params().count() > 0)
-        .unwrap_or_default();
+        .map_or(false, |gen_list| gen_list.lifetime_params().next().is_some());
 
     if has_lifetime {
         return None;
@@ -41,7 +40,7 @@ pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext) -> Op
 
     acc.add(
         AssistId("add_lifetime_to_type", AssistKind::Generate),
-        "Add lifetime`",
+        "Add lifetime",
         target,
         |builder| {
             match node.generic_param_list() {

crates/ide_assists/src/handlers/add_turbo_fish.rs

@@ -26,7 +26,7 @@ use crate::{
 pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let ident = ctx.find_token_syntax_at_offset(SyntaxKind::IDENT).or_else(|| {
         let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
-        if arg_list.args().count() > 0 {
+        if arg_list.args().next().is_some() {
             return None;
         }
         cov_mark::hit!(add_turbo_fish_after_call);

crates/rust-analyzer/src/handlers.rs

@@ -465,8 +465,11 @@ pub(crate) fn handle_will_rename_files(
     source_change.file_system_edits.clear();
     // no collect here because we want to merge text edits on same file ids
     source_change.extend(source_changes.map(|it| it.source_file_edits).flatten());
-    let workspace_edit = to_proto::workspace_edit(&snap, source_change)?;
-    Ok(Some(workspace_edit))
+    if source_change.source_file_edits.is_empty() {
+        Ok(None)
+    } else {
+        to_proto::workspace_edit(&snap, source_change).map(Some)
+    }
 }
 
 pub(crate) fn handle_goto_definition(

crates/rust-analyzer/tests/rust-analyzer/main.rs

@@ -838,9 +838,7 @@ fn main() {}
                 new_uri: base_path.join("src/from_mod/foo.rs").to_str().unwrap().to_string(),
             }],
         },
-        json!({
-          "documentChanges": []
-        }),
+        json!(null),
     );
 
     //rename file from foo.rs to mod.rs
@@ -851,9 +849,7 @@ fn main() {}
                 new_uri: base_path.join("src/to_mod/mod.rs").to_str().unwrap().to_string(),
             }],
         },
-        json!({
-          "documentChanges": []
-        }),
+        json!(null),
     );
 
     //rename same level file