diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
new file mode 100644
index 00000000000..99295574047
--- /dev/null
+++ b/crates/ra_ide_api/src/change.rs
@@ -0,0 +1,255 @@
+use std::{
+ fmt, time,
+ sync::Arc,
+};
+
+use rustc_hash::FxHashMap;
+use ra_db::{
+ SourceRootId, FileId, CrateGraph, SourceDatabase, SourceRoot,
+ salsa::{Database, SweepStrategy},
+};
+use ra_syntax::SourceFile;
+use relative_path::RelativePathBuf;
+use rayon::prelude::*;
+
+use crate::{
+ db::RootDatabase,
+ symbol_index::{SymbolIndex, SymbolsDatabase},
+ status::syntax_tree_stats,
+};
+
+#[derive(Default)]
+pub struct AnalysisChange {
+ new_roots: Vec<(SourceRootId, bool)>,
+ roots_changed: FxHashMap<SourceRootId, RootChange>,
+ files_changed: Vec<(FileId, Arc<String>)>,
+ libraries_added: Vec<LibraryData>,
+ crate_graph: Option<CrateGraph>,
+}
+
+impl fmt::Debug for AnalysisChange {
+ fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+ let mut d = fmt.debug_struct("AnalysisChange");
+ if !self.new_roots.is_empty() {
+ d.field("new_roots", &self.new_roots);
+ }
+ if !self.roots_changed.is_empty() {
+ d.field("roots_changed", &self.roots_changed);
+ }
+ if !self.files_changed.is_empty() {
+ d.field("files_changed", &self.files_changed.len());
+ }
+ if !self.libraries_added.is_empty() {
+ d.field("libraries_added", &self.libraries_added.len());
+ }
+ if !self.crate_graph.is_some() {
+ d.field("crate_graph", &self.crate_graph);
+ }
+ d.finish()
+ }
+}
+
+impl AnalysisChange {
+ pub fn new() -> AnalysisChange {
+ AnalysisChange::default()
+ }
+
+ pub fn add_root(&mut self, root_id: SourceRootId, is_local: bool) {
+ self.new_roots.push((root_id, is_local));
+ }
+
+ pub fn add_file(
+ &mut self,
+ root_id: SourceRootId,
+ file_id: FileId,
+ path: RelativePathBuf,
+ text: Arc<String>,
+ ) {
+ let file = AddFile {
+ file_id,
+ path,
+ text,
+ };
+ self.roots_changed
+ .entry(root_id)
+ .or_default()
+ .added
+ .push(file);
+ }
+
+ pub fn change_file(&mut self, file_id: FileId, new_text: Arc<String>) {
+ self.files_changed.push((file_id, new_text))
+ }
+
+ pub fn remove_file(&mut self, root_id: SourceRootId, file_id: FileId, path: RelativePathBuf) {
+ let file = RemoveFile { file_id, path };
+ self.roots_changed
+ .entry(root_id)
+ .or_default()
+ .removed
+ .push(file);
+ }
+
+ pub fn add_library(&mut self, data: LibraryData) {
+ self.libraries_added.push(data)
+ }
+
+ pub fn set_crate_graph(&mut self, graph: CrateGraph) {
+ self.crate_graph = Some(graph);
+ }
+}
+
+#[derive(Debug)]
+struct AddFile {
+ file_id: FileId,
+ path: RelativePathBuf,
+ text: Arc<String>,
+}
+
+#[derive(Debug)]
+struct RemoveFile {
+ file_id: FileId,
+ path: RelativePathBuf,
+}
+
+#[derive(Default)]
+struct RootChange {
+ added: Vec<AddFile>,
+ removed: Vec<RemoveFile>,
+}
+
+impl fmt::Debug for RootChange {
+ fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+ fmt.debug_struct("AnalysisChange")
+ .field("added", &self.added.len())
+ .field("removed", &self.removed.len())
+ .finish()
+ }
+}
+
+pub struct LibraryData {
+ root_id: SourceRootId,
+ root_change: RootChange,
+ symbol_index: SymbolIndex,
+}
+
+impl fmt::Debug for LibraryData {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ f.debug_struct("LibraryData")
+ .field("root_id", &self.root_id)
+ .field("root_change", &self.root_change)
+ .field("n_symbols", &self.symbol_index.len())
+ .finish()
+ }
+}
+
+impl LibraryData {
+ pub fn prepare(
+ root_id: SourceRootId,
+ files: Vec<(FileId, RelativePathBuf, Arc<String>)>,
+ ) -> LibraryData {
+ let symbol_index = SymbolIndex::for_files(files.par_iter().map(|(file_id, _, text)| {
+ let file = SourceFile::parse(text);
+ (*file_id, file)
+ }));
+ let mut root_change = RootChange::default();
+ root_change.added = files
+ .into_iter()
+ .map(|(file_id, path, text)| AddFile {
+ file_id,
+ path,
+ text,
+ })
+ .collect();
+ LibraryData {
+ root_id,
+ root_change,
+ symbol_index,
+ }
+ }
+}
+
+const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100);
+
+impl RootDatabase {
+ pub(crate) fn apply_change(&mut self, change: AnalysisChange) {
+ log::info!("apply_change {:?}", change);
+ if !change.new_roots.is_empty() {
+ let mut local_roots = Vec::clone(&self.local_roots());
+ for (root_id, is_local) in change.new_roots {
+ self.set_source_root(root_id, Default::default());
+ if is_local {
+ local_roots.push(root_id);
+ }
+ }
+ self.set_local_roots(Arc::new(local_roots));
+ }
+
+ for (root_id, root_change) in change.roots_changed {
+ self.apply_root_change(root_id, root_change);
+ }
+ for (file_id, text) in change.files_changed {
+ self.set_file_text(file_id, text)
+ }
+ if !change.libraries_added.is_empty() {
+ let mut libraries = Vec::clone(&self.library_roots());
+ for library in change.libraries_added {
+ libraries.push(library.root_id);
+ self.set_source_root(library.root_id, Default::default());
+ self.set_constant_library_symbols(library.root_id, Arc::new(library.symbol_index));
+ self.apply_root_change(library.root_id, library.root_change);
+ }
+ self.set_library_roots(Arc::new(libraries));
+ }
+ if let Some(crate_graph) = change.crate_graph {
+ self.set_crate_graph(Arc::new(crate_graph))
+ }
+ }
+
+ fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) {
+ let mut source_root = SourceRoot::clone(&self.source_root(root_id));
+ for add_file in root_change.added {
+ self.set_file_text(add_file.file_id, add_file.text);
+ self.set_file_relative_path(add_file.file_id, add_file.path.clone());
+ self.set_file_source_root(add_file.file_id, root_id);
+ source_root.files.insert(add_file.path, add_file.file_id);
+ }
+ for remove_file in root_change.removed {
+ self.set_file_text(remove_file.file_id, Default::default());
+ source_root.files.remove(&remove_file.path);
+ }
+ self.set_source_root(root_id, Arc::new(source_root));
+ }
+
+ pub(crate) fn maybe_collect_garbage(&mut self) {
+ if self.last_gc_check.elapsed() > GC_COOLDOWN {
+ self.last_gc_check = time::Instant::now();
+ let retained_trees = syntax_tree_stats(self).retained;
+ if retained_trees > 100 {
+ log::info!(
+ "automatic garbadge collection, {} retained trees",
+ retained_trees
+ );
+ self.collect_garbage();
+ }
+ }
+ }
+
+ pub(crate) fn collect_garbage(&mut self) {
+ self.last_gc = time::Instant::now();
+
+ let sweep = SweepStrategy::default()
+ .discard_values()
+ .sweep_all_revisions();
+
+ self.query(ra_db::ParseQuery).sweep(sweep);
+
+ self.query(hir::db::HirParseQuery).sweep(sweep);
+ self.query(hir::db::FileItemsQuery).sweep(sweep);
+ self.query(hir::db::FileItemQuery).sweep(sweep);
+
+ self.query(hir::db::LowerModuleQuery).sweep(sweep);
+ self.query(hir::db::LowerModuleSourceMapQuery).sweep(sweep);
+ self.query(hir::db::BodySyntaxMappingQuery).sweep(sweep);
+ }
+}
diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index b139efabf6d..7d672656f7a 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -1,115 +1,20 @@
-use std::{
- sync::Arc,
- time,
-};
-
use hir::{
self, Problem, source_binder
};
-use ra_db::{
- SourceDatabase, SourceRoot, SourceRootId,
- salsa::{Database, SweepStrategy},
-};
use ra_ide_api_light::{self, LocalEdit, Severity};
use ra_syntax::{
algo::find_node_at_offset, ast::{self, NameOwner}, AstNode,
SourceFile,
TextRange,
};
+use ra_db::SourceDatabase;
use crate::{
- AnalysisChange,
CrateId, db, Diagnostic, FileId, FilePosition, FileSystemEdit,
- Query, RootChange, SourceChange, SourceFileEdit,
- symbol_index::{FileSymbol, SymbolsDatabase},
- status::syntax_tree_stats
+ Query, SourceChange, SourceFileEdit,
+ symbol_index::FileSymbol,
};
-const GC_COOLDOWN: time::Duration = time::Duration::from_millis(100);
-
-impl db::RootDatabase {
- pub(crate) fn apply_change(&mut self, change: AnalysisChange) {
- log::info!("apply_change {:?}", change);
- if !change.new_roots.is_empty() {
- let mut local_roots = Vec::clone(&self.local_roots());
- for (root_id, is_local) in change.new_roots {
- self.set_source_root(root_id, Default::default());
- if is_local {
- local_roots.push(root_id);
- }
- }
- self.set_local_roots(Arc::new(local_roots));
- }
-
- for (root_id, root_change) in change.roots_changed {
- self.apply_root_change(root_id, root_change);
- }
- for (file_id, text) in change.files_changed {
- self.set_file_text(file_id, text)
- }
- if !change.libraries_added.is_empty() {
- let mut libraries = Vec::clone(&self.library_roots());
- for library in change.libraries_added {
- libraries.push(library.root_id);
- self.set_source_root(library.root_id, Default::default());
- self.set_constant_library_symbols(library.root_id, Arc::new(library.symbol_index));
- self.apply_root_change(library.root_id, library.root_change);
- }
- self.set_library_roots(Arc::new(libraries));
- }
- if let Some(crate_graph) = change.crate_graph {
- self.set_crate_graph(Arc::new(crate_graph))
- }
- }
-
- fn apply_root_change(&mut self, root_id: SourceRootId, root_change: RootChange) {
- let mut source_root = SourceRoot::clone(&self.source_root(root_id));
- for add_file in root_change.added {
- self.set_file_text(add_file.file_id, add_file.text);
- self.set_file_relative_path(add_file.file_id, add_file.path.clone());
- self.set_file_source_root(add_file.file_id, root_id);
- source_root.files.insert(add_file.path, add_file.file_id);
- }
- for remove_file in root_change.removed {
- self.set_file_text(remove_file.file_id, Default::default());
- source_root.files.remove(&remove_file.path);
- }
- self.set_source_root(root_id, Arc::new(source_root));
- }
-
- pub(crate) fn maybe_collect_garbage(&mut self) {
- if self.last_gc_check.elapsed() > GC_COOLDOWN {
- self.last_gc_check = time::Instant::now();
- let retained_trees = syntax_tree_stats(self).retained;
- if retained_trees > 100 {
- log::info!(
- "automatic garbadge collection, {} retained trees",
- retained_trees
- );
- self.collect_garbage();
- }
- }
- }
-
- pub(crate) fn collect_garbage(&mut self) {
- self.last_gc = time::Instant::now();
-
- let sweep = SweepStrategy::default()
- .discard_values()
- .sweep_all_revisions();
-
- self.query(ra_db::ParseQuery).sweep(sweep);
-
- self.query(hir::db::HirParseQuery).sweep(sweep);
- self.query(hir::db::FileItemsQuery).sweep(sweep);
- self.query(hir::db::FileItemQuery).sweep(sweep);
-
- self.query(hir::db::LowerModuleQuery).sweep(sweep);
- self.query(hir::db::LowerModuleSourceMapQuery).sweep(sweep);
- self.query(hir::db::BodySyntaxMappingQuery).sweep(sweep);
- }
-}
-
impl db::RootDatabase {
/// Returns `Vec` for the same reason as `parent_module`
pub(crate) fn crate_for(&self, file_id: FileId) -> Vec<CrateId> {
diff --git a/crates/ra_ide_api/src/impls.rs b/crates/ra_ide_api/src/impls.rs
index 91fa41f1f4b..4fb05413951 100644
--- a/crates/ra_ide_api/src/impls.rs
+++ b/crates/ra_ide_api/src/impls.rs
@@ -1,4 +1,4 @@
-use ra_db::{SourceDatabase};
+use ra_db::SourceDatabase;
use ra_syntax::{
AstNode, ast,
algo::find_node_at_offset,
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 68d59aae19b..22a601ec815 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -18,6 +18,7 @@ mod imp;
pub mod mock_analysis;
mod symbol_index;
mod navigation_target;
+mod change;
mod status;
mod completion;
@@ -35,7 +36,7 @@ mod assists;
#[cfg(test)]
mod marks;
-use std::{fmt, sync::Arc};
+use std::sync::Arc;
use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit};
use ra_text_edit::TextEdit;
@@ -43,12 +44,10 @@ use ra_db::{
SourceDatabase, CheckCanceled,
salsa::{self, ParallelDatabase},
};
-use rayon::prelude::*;
use relative_path::RelativePathBuf;
-use rustc_hash::FxHashMap;
use crate::{
- symbol_index::{FileSymbol, SymbolIndex},
+ symbol_index::FileSymbol,
db::LineIndexDatabase,
};
@@ -56,6 +55,7 @@ pub use crate::{
completion::{CompletionItem, CompletionItemKind, InsertTextFormat},
runnables::{Runnable, RunnableKind},
navigation_target::NavigationTarget,
+ change::{AnalysisChange, LibraryData},
};
pub use ra_ide_api_light::{
Fold, FoldKind, HighlightedRange, Severity, StructureNode,
@@ -74,115 +74,6 @@ static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
pub type Cancelable<T> = Result<T, Canceled>;
-#[derive(Default)]
-pub struct AnalysisChange {
- new_roots: Vec<(SourceRootId, bool)>,
- roots_changed: FxHashMap<SourceRootId, RootChange>,
- files_changed: Vec<(FileId, Arc<String>)>,
- libraries_added: Vec<LibraryData>,
- crate_graph: Option<CrateGraph>,
-}
-
-#[derive(Default)]
-struct RootChange {
- added: Vec<AddFile>,
- removed: Vec<RemoveFile>,
-}
-
-#[derive(Debug)]
-struct AddFile {
- file_id: FileId,
- path: RelativePathBuf,
- text: Arc<String>,
-}
-
-#[derive(Debug)]
-struct RemoveFile {
- file_id: FileId,
- path: RelativePathBuf,
-}
-
-impl fmt::Debug for AnalysisChange {
- fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
- let mut d = fmt.debug_struct("AnalysisChange");
- if !self.new_roots.is_empty() {
- d.field("new_roots", &self.new_roots);
- }
- if !self.roots_changed.is_empty() {
- d.field("roots_changed", &self.roots_changed);
- }
- if !self.files_changed.is_empty() {
- d.field("files_changed", &self.files_changed.len());
- }
- if !self.libraries_added.is_empty() {
- d.field("libraries_added", &self.libraries_added.len());
- }
- if self.crate_graph.is_none() {
- d.field("crate_graph", &self.crate_graph);
- }
- d.finish()
- }
-}
-
-impl fmt::Debug for RootChange {
- fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
- fmt.debug_struct("AnalysisChange")
- .field("added", &self.added.len())
- .field("removed", &self.removed.len())
- .finish()
- }
-}
-
-impl AnalysisChange {
- pub fn new() -> AnalysisChange {
- AnalysisChange::default()
- }
-
- pub fn add_root(&mut self, root_id: SourceRootId, is_local: bool) {
- self.new_roots.push((root_id, is_local));
- }
-
- pub fn add_file(
- &mut self,
- root_id: SourceRootId,
- file_id: FileId,
- path: RelativePathBuf,
- text: Arc<String>,
- ) {
- let file = AddFile {
- file_id,
- path,
- text,
- };
- self.roots_changed
- .entry(root_id)
- .or_default()
- .added
- .push(file);
- }
-
- pub fn change_file(&mut self, file_id: FileId, new_text: Arc<String>) {
- self.files_changed.push((file_id, new_text))
- }
-
- pub fn remove_file(&mut self, root_id: SourceRootId, file_id: FileId, path: RelativePathBuf) {
- let file = RemoveFile { file_id, path };
- self.roots_changed
- .entry(root_id)
- .or_default()
- .removed
- .push(file);
- }
-
- pub fn add_library(&mut self, data: LibraryData) {
- self.libraries_added.push(data)
- }
-
- pub fn set_crate_graph(&mut self, graph: CrateGraph) {
- self.crate_graph = Some(graph);
- }
-}
-
#[derive(Debug)]
pub struct SourceChange {
pub label: String,
@@ -508,48 +399,6 @@ impl Analysis {
}
}
-pub struct LibraryData {
- root_id: SourceRootId,
- root_change: RootChange,
- symbol_index: SymbolIndex,
-}
-
-impl fmt::Debug for LibraryData {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- f.debug_struct("LibraryData")
- .field("root_id", &self.root_id)
- .field("root_change", &self.root_change)
- .field("n_symbols", &self.symbol_index.len())
- .finish()
- }
-}
-
-impl LibraryData {
- pub fn prepare(
- root_id: SourceRootId,
- files: Vec<(FileId, RelativePathBuf, Arc<String>)>,
- ) -> LibraryData {
- let symbol_index = SymbolIndex::for_files(files.par_iter().map(|(file_id, _, text)| {
- let file = SourceFile::parse(text);
- (*file_id, file)
- }));
- let mut root_change = RootChange::default();
- root_change.added = files
- .into_iter()
- .map(|(file_id, path, text)| AddFile {
- file_id,
- path,
- text,
- })
- .collect();
- LibraryData {
- root_id,
- root_change,
- symbol_index,
- }
- }
-}
-
#[test]
fn analysis_is_send() {
fn is_send<T: Send>() {}