1 files changed, 13 insertions, 2 deletions

diff --git a/crates/ra_hir/src/name.rs b/crates/ra_hir/src/name.rs
index ba17958eb..0bb7cae99 100644
--- a/crates/ra_hir/src/name.rs
+++ b/crates/ra_hir/src/name.rs
@@ -98,13 +98,15 @@ pub(crate) trait AsName {
 
 impl AsName for ast::NameRef {
     fn as_name(&self) -> Name {
-        Name::new(self.text().clone())
+        let name = resolve_name(self.text().clone()); 
+        Name::new(name)
     }
 }
 
 impl AsName for ast::Name {
     fn as_name(&self) -> Name {
-        Name::new(self.text().clone())
+        let name = resolve_name(self.text().clone());
+        Name::new(name)
     }
 }
 
@@ -184,3 +186,12 @@ impl AsName for KnownName {
         Name::new(s.into())
     }
 }
+
+fn resolve_name(text: SmolStr) -> SmolStr {
+    let raw_start = "r#";
+    if text.as_str().starts_with(raw_start) {
+        SmolStr::new(&text[raw_start.len()..])
+    } else {
+        text
+    }
+}