language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Escape characters in builtin macros correctly

Browse source
This commit is contained in:
Edwin Cheng 2021-05-09 19:57:29 +08:00
parent cf4d4f646b
commit 01ce37c805
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_expand/src/builtin_macro.rs
View file

@ -788,9 +788,9 @@ mod tests {
r##" r##"
#[rustc_builtin_macro] #[rustc_builtin_macro]
macro_rules! concat {} macro_rules! concat {}
concat!("foo", "r", 0, r#"bar"#, false); concat!("foo", "r", 0, r#"bar"#, "\n", false);
"##, "##,
expect![[r#""foor0barfalse""#]], expect![[r#""foor0bar\nfalse""#]],
); );
} }
} }

4
crates/hir_expand/src/quote.rs
View file

@ -196,8 +196,8 @@ impl_to_to_tokentrees! {
tt::Literal => self { self }; tt::Literal => self { self };
tt::Ident => self { self }; tt::Ident => self { self };
tt::Punct => self { self }; tt::Punct => self { self };
&str => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}}; &str => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}};
String => self { tt::Literal{text: format!("{:?}", self.escape_default().to_string()).into(), id: tt::TokenId::unspecified()}} String => self { tt::Literal{text: format!("\"{}\"", self.escape_debug()).into(), id: tt::TokenId::unspecified()}}
} }
#[cfg(test)] #[cfg(test)]