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

Merge #5035 #5037

Browse source 
5035: Less error-prone naming r=matklad a=matklad



bors r+
🤖

5037: Don't watch dirs if not asked to r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-06-24 15:18:13 +00:00 • committed by GitHub
commit 7e61f4c59e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/vfs-notify/src/lib.rs
View file

@ -89,8 +89,8 @@ impl LoaderActor {
match event {
Event::Message(msg) => match msg {
Message::Config(config) => {
let n_entries_total = config.load.len();
self.send(loader::Message::Progress { n_entries_total, n_entries_done: 0 });
let n_total = config.load.len();
self.send(loader::Message::Progress { n_total, n_done: 0 });
self.unwatch_all();
self.config.clear();
@ -99,10 +99,7 @@ impl LoaderActor {
let watch = config.watch.contains(&i);
let files = self.load_entry(entry, watch);
self.send(loader::Message::Loaded { files });
self.send(loader::Message::Progress {
n_entries_total,
n_entries_done: i + 1,
});
self.send(loader::Message::Progress { n_total, n_done: i + 1 });
}
self.config.sort_by(|x, y| x.0.cmp(&y.0));
}
@ -199,7 +196,7 @@ impl LoaderActor {
let is_dir = entry.file_type().is_dir();
let is_file = entry.file_type().is_file();
let abs_path = AbsPathBuf::try_from(entry.into_path()).unwrap();
if is_dir {
if is_dir && watch {
self.watch(abs_path.clone());
}
let rel_path = abs_path.strip_prefix(&path)?;