Skip to content

Commit 14aeed1

Browse files
committed
Add span to group.
1 parent e5c56cd commit 14aeed1

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

crates/proc-macro-srv/src/server.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl server::TokenStream for RustAnalyzer {
9797
match tree {
9898
bridge::TokenTree::Group(group) => {
9999
let group = Group {
100-
delimiter: delim_to_internal(group.delimiter),
100+
delimiter: delim_to_internal(group.delimiter, group.span),
101101
token_trees: match group.stream {
102102
Some(stream) => stream.into_iter().collect(),
103103
None => Vec::new(),
@@ -221,14 +221,14 @@ impl server::TokenStream for RustAnalyzer {
221221
}
222222
}
223223

224-
fn delim_to_internal(d: proc_macro::Delimiter) -> tt::Delimiter {
224+
fn delim_to_internal(d: proc_macro::Delimiter, span: bridge::DelimSpan<Span>) -> tt::Delimiter {
225225
let kind = match d {
226226
proc_macro::Delimiter::Parenthesis => tt::DelimiterKind::Parenthesis,
227227
proc_macro::Delimiter::Brace => tt::DelimiterKind::Brace,
228228
proc_macro::Delimiter::Bracket => tt::DelimiterKind::Bracket,
229229
proc_macro::Delimiter::None => tt::DelimiterKind::Invisible,
230230
};
231-
tt::Delimiter { open: tt::TokenId::unspecified(), close: tt::TokenId::unspecified(), kind }
231+
tt::Delimiter { open: span.open, close: span.close, kind }
232232
}
233233

234234
fn delim_to_external(d: tt::Delimiter) -> proc_macro::Delimiter {
@@ -270,6 +270,11 @@ impl server::SourceFile for RustAnalyzer {
270270
}
271271

272272
impl server::Span for RustAnalyzer {
273+
fn byte_range(&mut self, _span: Self::Span) -> std::ops::Range<usize> {
274+
// FIXME
275+
0..0
276+
}
277+
273278
fn debug(&mut self, span: Self::Span) -> String {
274279
format!("{:?}", span.0)
275280
}

0 commit comments

Comments
 (0)