2 files changed, 18 insertions, 5 deletions

diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 1a3bcffae..a524987fd 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -135,11 +135,7 @@ impl Completions {
             let (before, after) = (&docs[..idx], &docs[idx + s.len()..]);
             // Ensure to match the full word
             if after.starts_with('!')
-                && before
-                    .chars()
-                    .rev()
-                    .next()
-                    .map_or(true, |c| c != '_' && !c.is_ascii_alphanumeric())
+                && !before.ends_with(|c: char| c == '_' || c.is_ascii_alphanumeric())
             {
                 // It may have spaces before the braces like `foo! {}`
                 match after[1..].chars().find(|&c| !c.is_whitespace()) {
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index 3f88bb260..1de3cb579 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -743,4 +743,21 @@ fn func(foo: i32) { if true { <|>foo; }; }
             &["u32"],
         );
     }
+
+    #[test]
+    fn test_hover_non_ascii_space_doc() {
+        check_hover_result(
+            "
+            //- /lib.rs
+            ///　<- `\u{3000}` here
+            fn foo() {
+            }
+
+            fn bar() {
+                fo<|>o();
+            }
+            ",
+            &["fn foo()\n```\n\n<- `\u{3000}` here"],
+        );
+    }
 }