Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Fix TokenStream::to_string implementation dropping quotation marks

Browse source
This commit is contained in:
Lukas Wirth 2024-08-29 08:41:43 +02:00
parent d6666b16c4
commit abed6e24a8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
View file

@ -507,12 +507,17 @@ mod tests {
close: span, close: span,
kind: tt::DelimiterKind::Brace, kind: tt::DelimiterKind::Brace,
}, },
token_trees: Box::new([]), token_trees: Box::new([tt::TokenTree::Leaf(tt::Leaf::Literal(tt::Literal {
kind: tt::LitKind::Str,
symbol: Symbol::intern("string"),
suffix: None,
span,
}))]),
}), }),
], ],
}; };
assert_eq!(s.to_string(), "struct T {}"); assert_eq!(s.to_string(), "struct T {\"string\"}");
} }
#[test] #[test]

2
crates/tt/src/lib.rs
View file

@ -603,7 +603,7 @@ pub fn pretty<S>(tkns: &[TokenTree<S>]) -> String {
TokenTree::Leaf(Leaf::Ident(ident)) => { TokenTree::Leaf(Leaf::Ident(ident)) => {
format!("{}{}", ident.is_raw.as_str(), ident.sym) format!("{}{}", ident.is_raw.as_str(), ident.sym)
} }
TokenTree::Leaf(Leaf::Literal(literal)) => literal.symbol.as_str().to_owned(), TokenTree::Leaf(Leaf::Literal(literal)) => format!("{literal}"),
TokenTree::Leaf(Leaf::Punct(punct)) => format!("{}", punct.char), TokenTree::Leaf(Leaf::Punct(punct)) => format!("{}", punct.char),
TokenTree::Subtree(subtree) => { TokenTree::Subtree(subtree) => {
let content = pretty(&subtree.token_trees); let content = pretty(&subtree.token_trees);