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

show macro expanded trees in the stats as well

Browse source
This commit is contained in:
Aleksey Kladov 2019-06-01 22:11:38 +03:00
parent ccec71165b
commit 37e80c5297
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_ide_api/src/status.rs
View file

@ -4,11 +4,12 @@ use std::{
sync::Arc, sync::Arc,
}; };
use ra_syntax::{AstNode, Parse}; use ra_syntax::{TreeArc, SyntaxNode};
use ra_db::{ use ra_db::{
ParseQuery, FileTextQuery, SourceRootId, FileTextQuery, SourceRootId,
salsa::{Database, debug::{DebugQueryTable, TableEntry}}, salsa::{Database, debug::{DebugQueryTable, TableEntry}},
}; };
use hir::HirFileId;
use crate::{ use crate::{
FileId, db::RootDatabase, FileId, db::RootDatabase,
@ -16,7 +17,7 @@ use crate::{
}; };
pub(crate) fn syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats { pub(crate) fn syntax_tree_stats(db: &RootDatabase) -> SyntaxTreeStats {
db.query(ParseQuery).entries::<SyntaxTreeStats>() db.query(hir::db::ParseOrExpandQuery).entries::<SyntaxTreeStats>()
} }
pub(crate) fn status(db: &RootDatabase) -> String { pub(crate) fn status(db: &RootDatabase) -> String {
@ -72,17 +73,17 @@ impl fmt::Display for SyntaxTreeStats {
} }
} }
impl FromIterator<TableEntry<FileId, Parse>> for SyntaxTreeStats { impl FromIterator<TableEntry<HirFileId, Option<TreeArc<SyntaxNode>>>> for SyntaxTreeStats {
fn from_iter<T>(iter: T) -> SyntaxTreeStats fn from_iter<T>(iter: T) -> SyntaxTreeStats
where where
T: IntoIterator<Item = TableEntry<FileId, Parse>>, T: IntoIterator<Item = TableEntry<HirFileId, Option<TreeArc<SyntaxNode>>>>,
{ {
let mut res = SyntaxTreeStats::default(); let mut res = SyntaxTreeStats::default();
for entry in iter { for entry in iter {
res.total += 1; res.total += 1;
if let Some(value) = entry.value { if let Some(tree) = entry.value.and_then(|it| it) {
res.retained += 1; res.retained += 1;
res.retained_size += value.tree.syntax().memory_size_of_subtree(); res.retained_size += tree.memory_size_of_subtree();
} }
} }
res res