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

Special case fixup spans in server::Span impl, they are immutable

Browse source
This commit is contained in:
Lukas Wirth 2023-12-22 09:39:55 +01:00
parent 2e52aa1615
commit 9e8e124269
6 changed files with 67 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/proc-macro-srv/src/tests/utils.rs
View file

@ -1,11 +1,8 @@
//! utils used in proc-macro tests
use base_db::{
span::{ErasedFileAstId, SpanAnchor, SpanData, SyntaxContextId},
FileId,
};
use expect_test::Expect;
use proc_macro_api::msg::TokenId;
use span::{ErasedFileAstId, FileId, Span, SpanAnchor, SyntaxContextId};
use tt::TextRange;
use crate::{dylib, proc_macro_test_dylib_path, ProcMacroSrv};
@ -20,7 +17,7 @@ fn parse_string_spanned(
anchor: SpanAnchor,
call_site: SyntaxContextId,
src: &str,
) -> crate::server::TokenStream<SpanData> {
) -> crate::server::TokenStream<Span> {
crate::server::TokenStream::with_subtree(
mbe::parse_to_token_tree(anchor, call_site, src).unwrap(),
)
@ -68,7 +65,7 @@ fn assert_expand_impl(
.unwrap();
expect.assert_eq(&format!("{res:?}"));
let def_site = SpanData {
let def_site = Span {
range: TextRange::new(0.into(), 150.into()),
anchor: SpanAnchor {
file_id: FileId::from_raw(41),
@ -76,7 +73,7 @@ fn assert_expand_impl(
},
ctx: SyntaxContextId::ROOT,
};
let call_site = SpanData {
let call_site = Span {
range: TextRange::new(0.into(), 100.into()),
anchor: SpanAnchor {
file_id: FileId::from_raw(42),