Merge #7865

7865: preserve escape sequences when replacing string with char r=Veykril a=jDomantas

Currently it replaces escape sequence with the actual value, which is very wrong for `"\n"`.

Co-authored-by: Domantas Jadenkus <[email protected]>

1 files changed, 37 insertions, 1 deletions

diff --git a/crates/ide_assists/src/handlers/replace_string_with_char.rs b/crates/ide_assists/src/handlers/replace_string_with_char.rs
index 317318c24..303c0dcbe 100644
--- a/crates/ide_assists/src/handlers/replace_string_with_char.rs
+++ b/crates/ide_assists/src/handlers/replace_string_with_char.rs
@@ -31,7 +31,9 @@ pub(crate) fn replace_string_with_char(acc: &mut Assists, ctx: &AssistContext) -
         "Replace string with char",
         target,
         |edit| {
-            edit.replace(token.syntax().text_range(), format!("'{}'", value));
+            let token_text = token.syntax().text();
+            let inner_text = &token_text[1..token_text.len() - 1];
+            edit.replace(token.syntax().text_range(), format!("'{}'", inner_text));
         },
     )
 }
@@ -134,4 +136,38 @@ mod tests {
                 "##,
         )
     }
+
+    #[test]
+    fn replace_string_with_char_newline() {
+        check_assist(
+            replace_string_with_char,
+            r#"
+                fn f() {
+                    find($0"\n");
+                }
+                "#,
+            r##"
+                fn f() {
+                    find('\n');
+                }
+                "##,
+        )
+    }
+
+    #[test]
+    fn replace_string_with_char_unicode_escape() {
+        check_assist(
+            replace_string_with_char,
+            r#"
+                fn f() {
+                    find($0"\u{7FFF}");
+                }
+                "#,
+            r##"
+                fn f() {
+                    find('\u{7FFF}');
+                }
+                "##,
+        )
+    }
 }