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

Abstract over channel

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-25 08:39:33 +02:00
parent 69e6924dd5
commit dab8808e82
3 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/rust-analyzer/src/global_state.rs
View file

@ -9,7 +9,7 @@ use crossbeam_channel::{unbounded, Receiver};
use lsp_types::Url;
use parking_lot::RwLock;
use ra_db::{CrateId, SourceRoot, VfsPath};
use ra_flycheck::{FlycheckConfig, FlycheckHandle};
use ra_flycheck::{CheckTask, FlycheckConfig, FlycheckHandle};
use ra_ide::{Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId};
use ra_project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target};
use stdx::format_to;
@ -30,12 +30,15 @@ use rustc_hash::{FxHashMap, FxHashSet};
fn create_flycheck(
workspaces: &[ProjectWorkspace],
config: &FlycheckConfig,
) -> Option<FlycheckHandle> {
) -> Option<(FlycheckHandle, Receiver<CheckTask>)> {
// FIXME: Figure out the multi-workspace situation
workspaces.iter().find_map(move |w| match w {
ProjectWorkspace::Cargo { cargo, .. } => {
let (sender, receiver) = unbounded();
let sender = Box::new(move |msg| sender.send(msg).unwrap());
let cargo_project_root = cargo.workspace_root().to_path_buf();
Some(FlycheckHandle::spawn(config.clone(), cargo_project_root.into()))
let flycheck = FlycheckHandle::spawn(config.clone(), cargo_project_root.into(), sender);
Some((flycheck, receiver))
}
ProjectWorkspace::Json { .. } => {
log::warn!("Cargo check watching only supported for cargo workspaces, disabling");
@ -66,7 +69,7 @@ pub(crate) struct GlobalState {
pub(crate) analysis_host: AnalysisHost,
pub(crate) loader: Box<dyn vfs::loader::Handle>,
pub(crate) task_receiver: Receiver<vfs::loader::Message>,
pub(crate) flycheck: Option<FlycheckHandle>,
pub(crate) flycheck: Option<(FlycheckHandle, Receiver<CheckTask>)>,
pub(crate) diagnostics: DiagnosticCollection,
pub(crate) mem_docs: FxHashSet<VfsPath>,
pub(crate) vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,

6
crates/rust-analyzer/src/main_loop.rs
View file

@ -136,7 +136,7 @@ pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
Ok(task) => Event::Vfs(task),
Err(RecvError) => return Err("vfs died".into()),
},
recv(global_state.flycheck.as_ref().map_or(&never(), |it| &it.task_recv)) -> task => match task {
recv(global_state.flycheck.as_ref().map_or(&never(), |it| &it.1)) -> task => match task {
Ok(task) => Event::CheckWatcher(task),
Err(RecvError) => return Err("check watcher died".into()),
},
@ -290,7 +290,7 @@ fn loop_turn(
if became_ready {
if let Some(flycheck) = &global_state.flycheck {
flycheck.update();
flycheck.0.update();
}
}
@ -486,7 +486,7 @@ fn on_notification(
let not = match notification_cast::<lsp_types::notification::DidSaveTextDocument>(not) {
Ok(_params) => {
if let Some(flycheck) = &global_state.flycheck {
flycheck.update();
flycheck.0.update();
}
return Ok(());
}