Merge #11481

[rust.git] / crates / ide_assists / src / handlers / raw_string.rs

diff --git a/crates/ide_assists/src/handlers/raw_string.rs b/crates/ide_assists/src/handlers/raw_string.rs
index d0f1613f37b158453fe0515ff737201f5cc7b3a1..41f768c3175d01ed64d0b03dd144a2bda364e4ff 100644 (file)
--- a/crates/ide_assists/src/handlers/raw_string.rs
+++ b/crates/ide_assists/src/handlers/raw_string.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use syntax::{ast, AstToken, TextRange, TextSize};
+use syntax::{ast, ast::IsString, AstToken, TextRange, TextSize};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
@@ -35,7 +35,7 @@ pub(crate) fn make_raw_string(acc: &mut Assists, ctx: &AssistContext) -> Option<
             if matches!(value, Cow::Borrowed(_)) {
                 // Avoid replacing the whole string to better position the cursor.
                 edit.insert(token.syntax().text_range().start(), format!("r{}", hashes));
-                edit.insert(token.syntax().text_range().end(), format!("{}", hashes));
+                edit.insert(token.syntax().text_range().end(), hashes);
             } else {
                 edit.replace(
                     token.syntax().text_range(),
@@ -168,23 +168,23 @@ fn required_hashes(s: &str) -> usize {
     res
 }
 
-#[test]
-fn test_required_hashes() {
-    assert_eq!(0, required_hashes("abc"));
-    assert_eq!(0, required_hashes("###"));
-    assert_eq!(1, required_hashes("\""));
-    assert_eq!(2, required_hashes("\"#abc"));
-    assert_eq!(0, required_hashes("#abc"));
-    assert_eq!(3, required_hashes("#ab\"##c"));
-    assert_eq!(5, required_hashes("#ab\"##\"####c"));
-}
-
 #[cfg(test)]
 mod tests {
     use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
 
     use super::*;
 
+    #[test]
+    fn test_required_hashes() {
+        assert_eq!(0, required_hashes("abc"));
+        assert_eq!(0, required_hashes("###"));
+        assert_eq!(1, required_hashes("\""));
+        assert_eq!(2, required_hashes("\"#abc"));
+        assert_eq!(0, required_hashes("#abc"));
+        assert_eq!(3, required_hashes("#ab\"##c"));
+        assert_eq!(5, required_hashes("#ab\"##\"####c"));
+    }
+
     #[test]
     fn make_raw_string_target() {
         check_assist_target(