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

expand to syntax node

Browse source
This commit is contained in:
Aleksey Kladov 2019-05-14 01:42:59 +03:00
parent 101b3abfd7
commit 16c7405262
6 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_hir/src/ids.rs
View file

@ -4,7 +4,7 @@ use std::{
};
use ra_db::{FileId, salsa};
use ra_syntax::{TreeArc, SourceFile, AstNode, ast};
use ra_syntax::{TreeArc, AstNode, ast, SyntaxNode};
use mbe::MacroRules;
use crate::{
@ -56,17 +56,17 @@ impl HirFileId {
}
}
pub(crate) fn hir_parse_query(
pub(crate) fn parse_or_expand_query(
db: &impl DefDatabase,
file_id: HirFileId,
) -> TreeArc<SourceFile> {
) -> Option<TreeArc<SyntaxNode>> {
match file_id.0 {
HirFileIdRepr::File(file_id) => db.parse(file_id),
HirFileIdRepr::File(file_id) => Some(db.parse(file_id).syntax().to_owned()),
HirFileIdRepr::Macro(macro_file) => {
let macro_call_id = macro_file.macro_call_id;
let tt = match db.macro_expand(macro_call_id) {
Ok(it) => it,
Err(err) => {
let tt = db
.macro_expand(macro_call_id)
.map_err(|err| {
// Note:
// The final goal we would like to make all parse_macro success,
// such that the following log will not call anyway.
@ -75,12 +75,12 @@ impl HirFileId {
err,
macro_call_id.debug_dump(db)
);
// returning an empty string looks fishy...
return SourceFile::parse("");
}
};
})
.ok()?;
match macro_file.macro_file_kind {
MacroFileKind::Items => mbe::token_tree_to_ast_item_list(&tt),
MacroFileKind::Items => {
Some(mbe::token_tree_to_ast_item_list(&tt).syntax().to_owned())
}
}
}
}