language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed whitespace bug

Browse source
This commit is contained in:
Edwin Cheng 2020-03-04 23:38:58 +08:00
parent 028595548b
commit 6794d50a9b
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_mbe/src/syntax_bridge.rs
View file

@ -388,11 +388,12 @@ impl<'a> TreeSink for TtTreeSink<'a> {
return;
}
let mut last = self.cursor;
for _ in 0..n_tokens {
if self.cursor.eof() {
break;
}
last = self.cursor;
let text: SmolStr = match self.cursor.token_tree() {
Some(tt::TokenTree::Leaf(leaf)) => {
// Mark the range if needed
@ -441,11 +442,11 @@ impl<'a> TreeSink for TtTreeSink<'a> {
self.inner.token(kind, text);
// Add whitespace between adjoint puncts
let next = self.cursor.bump();
let next = last.bump();
if let (
Some(tt::TokenTree::Leaf(tt::Leaf::Punct(curr))),
Some(tt::TokenTree::Leaf(tt::Leaf::Punct(_))),
) = (self.cursor.token_tree(), next.token_tree())
) = (last.token_tree(), next.token_tree())
{
if curr.spacing == tt::Spacing::Alone {
self.inner.token(WHITESPACE, " ".into());