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

Some final touches

Browse source
This commit is contained in:
Lukas Wirth 2023-12-03 18:50:29 +01:00
parent 81410ab500
commit 18f1a3c3c6
10 changed files with 86 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/mbe/src/expander/transcriber.rs
View file

@ -79,8 +79,8 @@ impl<S: Span> Bindings<S> {
}
MetaVarKind::Block => Fragment::Tokens(tt::TokenTree::Subtree(tt::Subtree {
delimiter: tt::Delimiter {
open: S::DUMMY,
close: S::DUMMY,
open: span,
close: span,
kind: tt::DelimiterKind::Brace,
},
token_trees: vec![],
@ -225,6 +225,7 @@ fn expand_subtree<S: Span>(
arena.push(
tt::Leaf::Literal(tt::Literal {
text: index.to_string().into(),
// FIXME
span: S::DUMMY,
})
.into(),
@ -282,8 +283,12 @@ fn expand_subtree<S: Span>(
}
};
arena.push(
tt::Leaf::Literal(tt::Literal { text: c.to_string().into(), span: S::DUMMY })
.into(),
tt::Leaf::Literal(tt::Literal {
text: c.to_string().into(),
// FIXME
span: S::DUMMY,
})
.into(),
);
}
}
@ -337,7 +342,9 @@ fn expand_var<S: Span>(
}
Err(e) => ExpandResult {
value: Fragment::Tokens(tt::TokenTree::Subtree(tt::Subtree::empty(tt::DelimSpan {
// FIXME
open: S::DUMMY,
// FIXME
close: S::DUMMY,
}))),
err: Some(e),
@ -479,6 +486,7 @@ fn fix_up_and_push_path_tt<S: Span>(buf: &mut Vec<tt::TokenTree<S>>, subtree: tt
tt::Leaf::Punct(tt::Punct {
char: ':',
spacing: tt::Spacing::Joint,
// FIXME
span: S::DUMMY,
})
.into(),
@ -487,6 +495,7 @@ fn fix_up_and_push_path_tt<S: Span>(buf: &mut Vec<tt::TokenTree<S>>, subtree: tt
tt::Leaf::Punct(tt::Punct {
char: ':',
spacing: tt::Spacing::Alone,
// FIXME
span: S::DUMMY,
})
.into(),