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

Add parse_to_token_tree

Browse source
This commit is contained in:
Edwin Cheng 2020-03-09 00:13:04 +08:00
parent 013e908056
commit e7206467d5
5 changed files with 213 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_hir_expand/src/builtin_macro.rs
View file

@ -7,6 +7,7 @@ use crate::{
use crate::{quote, EagerMacroId, LazyMacroId, MacroCallId};
use either::Either;
use mbe::parse_to_token_tree;
use ra_db::{FileId, RelativePath};
use ra_parser::FragmentKind;
@ -306,10 +307,9 @@ fn include_expand(
// FIXME:
// Handle include as expression
let node =
db.parse_or_expand(file_id.into()).ok_or_else(|| mbe::ExpandError::ConversionError)?;
let res =
mbe::syntax_node_to_token_tree(&node).ok_or_else(|| mbe::ExpandError::ConversionError)?.0;
let res = parse_to_token_tree(&db.file_text(file_id.into()))
.ok_or_else(|| mbe::ExpandError::ConversionError)?
.0;
Ok((res, FragmentKind::Items))
}