From 6b1f30ade93b3bd73625cc354652738254175dba Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 27 Nov 2018 00:12:43 +0300 Subject: hack around nested libraries --- crates/ra_analysis/src/imp.rs | 8 ++++++++ crates/ra_analysis/src/input.rs | 3 +++ 2 files changed, 11 insertions(+) (limited to 'crates/ra_analysis') diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index e1493bdaa..ad6b52371 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -59,6 +59,9 @@ impl FileResolverImp { pub(crate) fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option { self.inner.resolve(file_id, path) } + pub(crate) fn debug_path(&self, file_id: FileId) -> Option { + self.inner.debug_path(file_id) + } fn inner(&self) -> *const FileResolver { &*self.inner } @@ -138,6 +141,11 @@ impl AnalysisHostImpl { let mut files = FxHashSet::default(); for (file_id, text) in library.files { files.insert(file_id); + log::debug!( + "library file: {:?} {:?}", + file_id, + library.file_resolver.debug_path(file_id) + ); self.db .query_mut(crate::input::FileSourceRootQuery) .set_constant(file_id, source_root_id); diff --git a/crates/ra_analysis/src/input.rs b/crates/ra_analysis/src/input.rs index ba8a17fd5..a78b6e397 100644 --- a/crates/ra_analysis/src/input.rs +++ b/crates/ra_analysis/src/input.rs @@ -33,6 +33,9 @@ impl CrateGraph { pub trait FileResolver: fmt::Debug + Send + Sync + 'static { fn file_stem(&self, file_id: FileId) -> String; fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option; + fn debug_path(&self, _file_id: FileId) -> Option { + None + } } salsa::query_group! { -- cgit v1.2.3