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

don't cache parses twice

Browse source 
Before this commit, `Parse`s for original file ended up two times in
salsa's db: first, when we parse original file, and second, when we
parse macro or a file.

Given that parse trees are the worst ofenders in terms of memory, it
makes sense to make sure we store them only once.
This commit is contained in:
Aleksey Kladov 2019-06-02 20:15:10 +03:00
parent b40c6de8a6
commit 8b7f58976b
5 changed files with 61 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,32 +62,35 @@ impl HirFileId {
file_id: HirFileId,
) -> Option<TreeArc<SyntaxNode>> {
db.check_canceled();
let _p = profile("parse_or_expand_query");
match file_id.0 {
HirFileIdRepr::File(file_id) => Some(db.parse(file_id).tree.syntax().to_owned()),
HirFileIdRepr::Macro(macro_file) => {
let macro_call_id = macro_file.macro_call_id;
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.
log::warn!(
"fail on macro_parse: (reason: {}) {}",
err,
macro_call_id.debug_dump(db)
);
})
.ok()?;
match macro_file.macro_file_kind {
MacroFileKind::Items => {
Some(mbe::token_tree_to_ast_item_list(&tt).syntax().to_owned())
}
MacroFileKind::Expr => {
mbe::token_tree_to_expr(&tt).ok().map(|it| it.syntax().to_owned())
}
}
HirFileIdRepr::Macro(macro_file) => db.parse_macro(macro_file),
}
}
pub(crate) fn parse_macro_query(
db: &impl AstDatabase,
macro_file: MacroFile,
) -> Option<TreeArc<SyntaxNode>> {
let _p = profile("parse_macro_query");
let macro_call_id = macro_file.macro_call_id;
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.
log::warn!(
"fail on macro_parse: (reason: {}) {}",
err,
macro_call_id.debug_dump(db)
);
})
.ok()?;
match macro_file.macro_file_kind {
MacroFileKind::Items => Some(mbe::token_tree_to_ast_item_list(&tt).syntax().to_owned()),
MacroFileKind::Expr => {
mbe::token_tree_to_expr(&tt).ok().map(|it| it.syntax().to_owned())
}
}
}
@ -100,7 +103,7 @@ enum HirFileIdRepr {
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
struct MacroFile {
pub struct MacroFile {
macro_call_id: MacroCallId,
macro_file_kind: MacroFileKind,
}