mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use autoreload config to gate execution rather that staleness

Browse Source
This commit is contained in:
Aleksey Kladov 2021-04-06 13:10:50 +03:00
parent 3698b3eab8
commit e3c47ccefc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/rust-analyzer/src/main_loop.rs
View File

@ -454,7 +454,9 @@ fn handle_event(&mut self, event: Event) -> Result<()> {
}
}
self.fetch_workspaces_if_needed();
if self.config.cargo_autoreload() {
self.fetch_workspaces_if_needed();
}
self.fetch_build_data_if_needed();
let loop_duration = loop_start.elapsed();
@ -494,7 +496,10 @@ fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()>
}
RequestDispatcher { req: Some(req), global_state: self }
.on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| Ok(s.fetch_workspaces_request()))?
.on_sync::<lsp_ext::ReloadWorkspace>(|s, ()| {
self.fetch_workspaces_request();
self.fetch_workspaces_if_needed();
})?
.on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))?
.on_sync::<lsp_ext::OnEnter>(|s, p| handlers::handle_on_enter(s.snapshot(), p))?
.on_sync::<lsp_types::request::Shutdown>(|s, ()| {

6
crates/rust-analyzer/src/reload.rs
View File

@ -60,11 +60,7 @@ pub(crate) fn maybe_refresh(&mut self, changes: &[(AbsPathBuf, ChangeKind)]) {
", "
)
);
if self.config.cargo_autoreload() {
self.fetch_workspaces_request();
} else {
self.transition(Status::NeedsReload);
}
self.fetch_workspaces_request();
fn is_interesting(path: &AbsPath, change_kind: ChangeKind) -> bool {
const IMPLICIT_TARGET_FILES: &[&str] = &["build.rs", "src/main.rs", "src/lib.rs"];