From: Jonas Schievink <jonasschievink@gmail.com>
Date: Fri, 7 May 2021 13:35:02 +0000 (+0200)
Subject: fix: use raw idents in `make::name{_ref}` with keywords
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e2b664e9fdecebd967d0c7d31e5ad5a07512b7a6;p=rust.git

fix: use raw idents in `make::name{_ref}` with keywords
---

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index b14f908b75e..273d8cfbb50 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -653,6 +653,26 @@ fn test_fn() {
         );
     }
 
+    #[test]
+    fn test_fill_struct_fields_raw_ident() {
+        check_fix(
+            r#"
+struct TestStruct { r#type: u8 }
+
+fn test_fn() {
+    TestStruct { $0 };
+}
+"#,
+            r"
+struct TestStruct { r#type: u8 }
+
+fn test_fn() {
+    TestStruct { r#type: ()  };
+}
+",
+        );
+    }
+
     #[test]
     fn test_fill_struct_fields_no_diagnostic() {
         check_no_diagnostics(
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 4bcea28cca8..f8b508a90ea 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -15,12 +15,22 @@
 use crate::{ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, SyntaxToken};
 
 pub fn name(text: &str) -> ast::Name {
-    ast_from_text(&format!("mod {};", text))
+    ast_from_text(&format!("mod {}{};", raw_ident_esc(text), text))
 }
 
 pub fn name_ref(text: &str) -> ast::NameRef {
-    ast_from_text(&format!("fn f() {{ {}; }}", text))
+    ast_from_text(&format!("fn f() {{ {}{}; }}", raw_ident_esc(text), text))
 }
+
+fn raw_ident_esc(ident: &str) -> &'static str {
+    let is_keyword = parser::SyntaxKind::from_keyword(ident).is_some();
+    if is_keyword && !matches!(ident, "self" | "crate" | "super" | "Self") {
+        "r#"
+    } else {
+        ""
+    }
+}
+
 // FIXME: replace stringly-typed constructor with a family of typed ctors, a-la
 // `expr_xxx`.
 pub fn ty(text: &str) -> ast::Type {