2019-12-27 04:10:07 -06:00
|
|
|
//! cargo_check provides the functionality needed to run `cargo check` or
|
|
|
|
//! another compatible command (f.x. clippy) in a background thread and provide
|
|
|
|
//! LSP diagnostics based on the output of the command.
|
2020-03-31 17:16:16 -05:00
|
|
|
|
2019-12-27 04:10:07 -06:00
|
|
|
use std::{
|
2020-05-10 10:35:33 -05:00
|
|
|
fmt,
|
2020-05-14 18:51:48 -05:00
|
|
|
io::{self, BufReader},
|
2020-06-28 13:00:04 -05:00
|
|
|
ops,
|
2020-04-01 05:03:06 -05:00
|
|
|
path::PathBuf,
|
2020-06-28 13:00:04 -05:00
|
|
|
process::{self, Command, Stdio},
|
2020-06-26 09:17:22 -05:00
|
|
|
time::Duration,
|
2019-12-27 04:10:07 -06:00
|
|
|
};
|
|
|
|
|
2020-06-25 06:47:22 -05:00
|
|
|
use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
|
2019-12-29 11:27:14 -06:00
|
|
|
|
2020-05-14 18:58:39 -05:00
|
|
|
pub use cargo_metadata::diagnostic::{
|
2020-05-14 19:08:50 -05:00
|
|
|
Applicability, Diagnostic, DiagnosticLevel, DiagnosticSpan, DiagnosticSpanMacroExpansion,
|
2020-05-14 18:58:39 -05:00
|
|
|
};
|
|
|
|
|
2020-04-01 11:41:43 -05:00
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
2020-04-01 05:31:42 -05:00
|
|
|
pub enum FlycheckConfig {
|
2020-06-09 14:47:54 -05:00
|
|
|
CargoCommand {
|
|
|
|
command: String,
|
|
|
|
all_targets: bool,
|
|
|
|
all_features: bool,
|
|
|
|
features: Vec<String>,
|
|
|
|
extra_args: Vec<String>,
|
|
|
|
},
|
|
|
|
CustomCommand {
|
|
|
|
command: String,
|
|
|
|
args: Vec<String>,
|
|
|
|
},
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
|
2020-05-10 10:35:33 -05:00
|
|
|
impl fmt::Display for FlycheckConfig {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
|
|
match self {
|
|
|
|
FlycheckConfig::CargoCommand { command, .. } => write!(f, "cargo {}", command),
|
|
|
|
FlycheckConfig::CustomCommand { command, args } => {
|
|
|
|
write!(f, "{} {}", command, args.join(" "))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-01 04:09:19 -05:00
|
|
|
/// Flycheck wraps the shared state and communication machinery used for
|
2019-12-27 04:10:07 -06:00
|
|
|
/// running `cargo check` (or other compatible command) and providing
|
|
|
|
/// diagnostics based on the output.
|
2019-12-27 04:43:05 -06:00
|
|
|
/// The spawned thread is shut down when this struct is dropped.
|
2019-12-27 04:10:07 -06:00
|
|
|
#[derive(Debug)]
|
2020-06-25 01:24:27 -05:00
|
|
|
pub struct FlycheckHandle {
|
2020-03-28 05:31:10 -05:00
|
|
|
// XXX: drop order is significant
|
2020-06-28 15:35:18 -05:00
|
|
|
sender: Sender<Restart>,
|
2020-06-28 15:31:40 -05:00
|
|
|
thread: jod_thread::JoinHandle,
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 01:24:27 -05:00
|
|
|
impl FlycheckHandle {
|
2020-06-25 01:39:33 -05:00
|
|
|
pub fn spawn(
|
2020-06-25 02:19:01 -05:00
|
|
|
sender: Box<dyn Fn(Message) + Send>,
|
2020-06-25 01:39:33 -05:00
|
|
|
config: FlycheckConfig,
|
|
|
|
workspace_root: PathBuf,
|
|
|
|
) -> FlycheckHandle {
|
2020-06-28 15:35:18 -05:00
|
|
|
let actor = FlycheckActor::new(sender, config, workspace_root);
|
|
|
|
let (sender, receiver) = unbounded::<Restart>();
|
|
|
|
let thread = jod_thread::spawn(move || actor.run(receiver));
|
|
|
|
FlycheckHandle { sender, thread }
|
2020-01-11 14:32:40 -06:00
|
|
|
}
|
|
|
|
|
2019-12-27 04:10:07 -06:00
|
|
|
/// Schedule a re-start of the cargo check worker.
|
|
|
|
pub fn update(&self) {
|
2020-06-28 15:35:18 -05:00
|
|
|
self.sender.send(Restart).unwrap();
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
2020-06-25 02:19:01 -05:00
|
|
|
pub enum Message {
|
2020-01-15 08:50:49 -06:00
|
|
|
/// Request adding a diagnostic with fixes included to a file
|
2020-05-14 18:58:39 -05:00
|
|
|
AddDiagnostic { workspace_root: PathBuf, diagnostic: Diagnostic },
|
2020-06-25 01:01:03 -05:00
|
|
|
|
|
|
|
/// Request check progress notification to client
|
2020-06-25 02:19:01 -05:00
|
|
|
Progress(Progress),
|
2020-06-25 01:01:03 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
2020-06-25 02:19:01 -05:00
|
|
|
pub enum Progress {
|
2020-06-26 09:17:22 -05:00
|
|
|
DidStart,
|
2020-06-25 02:19:01 -05:00
|
|
|
DidCheckCrate(String),
|
2020-06-28 16:42:44 -05:00
|
|
|
DidFinish(io::Result<()>),
|
2020-06-26 09:17:22 -05:00
|
|
|
DidCancel,
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 02:26:13 -05:00
|
|
|
struct Restart;
|
2019-12-27 04:10:07 -06:00
|
|
|
|
2020-06-25 01:24:27 -05:00
|
|
|
struct FlycheckActor {
|
2020-06-25 02:19:01 -05:00
|
|
|
sender: Box<dyn Fn(Message) + Send>,
|
2020-04-01 05:03:06 -05:00
|
|
|
config: FlycheckConfig,
|
2019-12-27 04:43:05 -06:00
|
|
|
workspace_root: PathBuf,
|
2020-03-31 17:39:50 -05:00
|
|
|
/// WatchThread exists to wrap around the communication needed to be able to
|
|
|
|
/// run `cargo check` without blocking. Currently the Rust standard library
|
|
|
|
/// doesn't provide a way to read sub-process output without blocking, so we
|
|
|
|
/// have to wrap sub-processes output handling in a thread and pass messages
|
|
|
|
/// back over a channel.
|
2020-06-28 16:42:44 -05:00
|
|
|
cargo_handle: Option<CargoHandle>,
|
2020-06-25 06:47:22 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
enum Event {
|
|
|
|
Restart(Restart),
|
2020-06-26 09:17:22 -05:00
|
|
|
CheckEvent(Option<cargo_metadata::Message>),
|
2019-12-27 04:43:05 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 01:24:27 -05:00
|
|
|
impl FlycheckActor {
|
2020-06-25 01:39:33 -05:00
|
|
|
fn new(
|
2020-06-25 02:19:01 -05:00
|
|
|
sender: Box<dyn Fn(Message) + Send>,
|
2020-06-25 01:39:33 -05:00
|
|
|
config: FlycheckConfig,
|
|
|
|
workspace_root: PathBuf,
|
|
|
|
) -> FlycheckActor {
|
2020-06-28 16:42:44 -05:00
|
|
|
FlycheckActor { sender, config, workspace_root, cargo_handle: None }
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
2020-06-25 10:14:11 -05:00
|
|
|
fn next_event(&self, inbox: &Receiver<Restart>) -> Option<Event> {
|
2020-06-28 16:42:44 -05:00
|
|
|
let check_chan = self.cargo_handle.as_ref().map(|cargo| &cargo.receiver);
|
2020-06-25 10:14:11 -05:00
|
|
|
select! {
|
|
|
|
recv(inbox) -> msg => msg.ok().map(Event::Restart),
|
|
|
|
recv(check_chan.unwrap_or(&never())) -> msg => Some(Event::CheckEvent(msg.ok())),
|
|
|
|
}
|
|
|
|
}
|
2020-06-28 15:35:18 -05:00
|
|
|
fn run(mut self, inbox: Receiver<Restart>) {
|
2020-06-25 06:47:22 -05:00
|
|
|
while let Some(event) = self.next_event(&inbox) {
|
|
|
|
match event {
|
2020-06-26 09:17:22 -05:00
|
|
|
Event::Restart(Restart) => {
|
|
|
|
while let Ok(Restart) = inbox.recv_timeout(Duration::from_millis(50)) {}
|
2020-06-28 16:42:44 -05:00
|
|
|
|
2020-06-26 09:17:22 -05:00
|
|
|
self.cancel_check_process();
|
2020-06-28 16:42:44 -05:00
|
|
|
|
|
|
|
let mut command = self.check_command();
|
|
|
|
command.stdout(Stdio::piped()).stderr(Stdio::null()).stdin(Stdio::null());
|
|
|
|
if let Ok(child) = command.spawn().map(JodChild) {
|
|
|
|
self.cargo_handle = Some(CargoHandle::spawn(child));
|
|
|
|
self.send(Message::Progress(Progress::DidStart));
|
|
|
|
}
|
2020-06-26 09:17:22 -05:00
|
|
|
}
|
2020-06-25 06:47:22 -05:00
|
|
|
Event::CheckEvent(None) => {
|
|
|
|
// Watcher finished, replace it with a never channel to
|
|
|
|
// avoid busy-waiting.
|
2020-06-28 16:42:44 -05:00
|
|
|
let cargo_handle = self.cargo_handle.take().unwrap();
|
|
|
|
let res = cargo_handle.join();
|
|
|
|
self.send(Message::Progress(Progress::DidFinish(res)));
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
2020-06-26 09:17:22 -05:00
|
|
|
Event::CheckEvent(Some(message)) => match message {
|
|
|
|
cargo_metadata::Message::CompilerArtifact(msg) => {
|
2020-06-25 06:47:22 -05:00
|
|
|
self.send(Message::Progress(Progress::DidCheckCrate(msg.target.name)));
|
|
|
|
}
|
|
|
|
|
2020-06-26 09:17:22 -05:00
|
|
|
cargo_metadata::Message::CompilerMessage(msg) => {
|
2020-06-25 06:47:22 -05:00
|
|
|
self.send(Message::AddDiagnostic {
|
|
|
|
workspace_root: self.workspace_root.clone(),
|
|
|
|
diagnostic: msg.message,
|
|
|
|
});
|
|
|
|
}
|
2019-12-27 04:10:07 -06:00
|
|
|
|
2020-06-26 09:17:22 -05:00
|
|
|
cargo_metadata::Message::BuildScriptExecuted(_)
|
|
|
|
| cargo_metadata::Message::BuildFinished(_)
|
|
|
|
| cargo_metadata::Message::TextLine(_)
|
|
|
|
| cargo_metadata::Message::Unknown => {}
|
2020-06-25 06:47:22 -05:00
|
|
|
},
|
|
|
|
}
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
2020-06-26 09:17:22 -05:00
|
|
|
// If we rerun the thread, we need to discard the previous check results first
|
|
|
|
self.cancel_check_process();
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
2020-06-26 09:17:22 -05:00
|
|
|
fn cancel_check_process(&mut self) {
|
2020-06-28 16:42:44 -05:00
|
|
|
if self.cargo_handle.take().is_some() {
|
2020-06-26 09:17:22 -05:00
|
|
|
self.send(Message::Progress(Progress::DidCancel));
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
}
|
2020-06-28 16:42:44 -05:00
|
|
|
fn check_command(&self) -> Command {
|
2020-04-01 05:31:42 -05:00
|
|
|
let mut cmd = match &self.config {
|
2020-06-09 14:47:54 -05:00
|
|
|
FlycheckConfig::CargoCommand {
|
|
|
|
command,
|
|
|
|
all_targets,
|
|
|
|
all_features,
|
|
|
|
extra_args,
|
|
|
|
features,
|
|
|
|
} => {
|
2020-05-08 07:54:29 -05:00
|
|
|
let mut cmd = Command::new(ra_toolchain::cargo());
|
2020-04-01 05:31:42 -05:00
|
|
|
cmd.arg(command);
|
2020-05-08 07:54:29 -05:00
|
|
|
cmd.args(&["--workspace", "--message-format=json", "--manifest-path"])
|
|
|
|
.arg(self.workspace_root.join("Cargo.toml"));
|
2020-04-01 05:31:42 -05:00
|
|
|
if *all_targets {
|
|
|
|
cmd.arg("--all-targets");
|
|
|
|
}
|
2020-05-05 15:44:39 -05:00
|
|
|
if *all_features {
|
|
|
|
cmd.arg("--all-features");
|
2020-06-09 14:47:54 -05:00
|
|
|
} else if !features.is_empty() {
|
|
|
|
cmd.arg("--features");
|
|
|
|
cmd.arg(features.join(" "));
|
2020-05-05 15:44:39 -05:00
|
|
|
}
|
2020-04-01 05:31:42 -05:00
|
|
|
cmd.args(extra_args);
|
|
|
|
cmd
|
|
|
|
}
|
|
|
|
FlycheckConfig::CustomCommand { command, args } => {
|
|
|
|
let mut cmd = Command::new(command);
|
|
|
|
cmd.args(args);
|
|
|
|
cmd
|
2020-04-01 05:03:06 -05:00
|
|
|
}
|
|
|
|
};
|
2020-04-01 05:31:42 -05:00
|
|
|
cmd.current_dir(&self.workspace_root);
|
2020-06-28 16:42:44 -05:00
|
|
|
cmd
|
2020-03-31 17:39:50 -05:00
|
|
|
}
|
2020-06-25 01:39:33 -05:00
|
|
|
|
2020-06-25 02:19:01 -05:00
|
|
|
fn send(&self, check_task: Message) {
|
2020-06-25 01:39:33 -05:00
|
|
|
(self.sender)(check_task)
|
|
|
|
}
|
2019-12-27 04:10:07 -06:00
|
|
|
}
|
|
|
|
|
2020-06-28 16:01:28 -05:00
|
|
|
struct CargoHandle {
|
2020-06-28 16:42:44 -05:00
|
|
|
child: JodChild,
|
2020-06-28 16:01:28 -05:00
|
|
|
#[allow(unused)]
|
2020-06-28 16:42:44 -05:00
|
|
|
thread: jod_thread::JoinHandle<io::Result<bool>>,
|
|
|
|
receiver: Receiver<cargo_metadata::Message>,
|
2020-06-28 16:01:28 -05:00
|
|
|
}
|
2020-03-21 16:30:33 -05:00
|
|
|
|
2020-06-28 16:01:28 -05:00
|
|
|
impl CargoHandle {
|
2020-06-28 16:42:44 -05:00
|
|
|
fn spawn(mut child: JodChild) -> CargoHandle {
|
|
|
|
let child_stdout = child.stdout.take().unwrap();
|
2020-06-28 16:01:28 -05:00
|
|
|
let (sender, receiver) = unbounded();
|
2020-06-28 16:42:44 -05:00
|
|
|
let actor = CargoActor::new(child_stdout, sender);
|
|
|
|
let thread = jod_thread::spawn(move || actor.run());
|
|
|
|
CargoHandle { child, thread, receiver }
|
|
|
|
}
|
|
|
|
fn join(mut self) -> io::Result<()> {
|
|
|
|
// It is okay to ignore the result, as it only errors if the process is already dead
|
|
|
|
let _ = self.child.kill();
|
|
|
|
let exit_status = self.child.wait()?;
|
|
|
|
let read_at_least_one_message = self.thread.join()?;
|
|
|
|
if !exit_status.success() && !read_at_least_one_message {
|
|
|
|
// FIXME: Read the stderr to display the reason, see `read2()` reference in PR comment:
|
|
|
|
// https://github.com/rust-analyzer/rust-analyzer/pull/3632#discussion_r395605298
|
|
|
|
return Err(io::Error::new(
|
|
|
|
io::ErrorKind::Other,
|
|
|
|
format!(
|
|
|
|
"Cargo watcher failed,the command produced no valid metadata (exit code: {:?})",
|
|
|
|
exit_status
|
|
|
|
),
|
|
|
|
));
|
|
|
|
}
|
|
|
|
Ok(())
|
2020-03-16 07:43:29 -05:00
|
|
|
}
|
2020-06-28 16:01:28 -05:00
|
|
|
}
|
2020-03-16 07:43:29 -05:00
|
|
|
|
2020-06-28 16:01:28 -05:00
|
|
|
struct CargoActor {
|
2020-06-28 16:42:44 -05:00
|
|
|
child_stdout: process::ChildStdout,
|
2020-06-28 16:01:28 -05:00
|
|
|
sender: Sender<cargo_metadata::Message>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CargoActor {
|
2020-06-28 16:42:44 -05:00
|
|
|
fn new(
|
|
|
|
child_stdout: process::ChildStdout,
|
|
|
|
sender: Sender<cargo_metadata::Message>,
|
|
|
|
) -> CargoActor {
|
|
|
|
CargoActor { child_stdout, sender }
|
2020-04-01 05:45:37 -05:00
|
|
|
}
|
2020-06-28 16:42:44 -05:00
|
|
|
fn run(self) -> io::Result<bool> {
|
2020-06-28 16:01:28 -05:00
|
|
|
// We manually read a line at a time, instead of using serde's
|
|
|
|
// stream deserializers, because the deserializer cannot recover
|
|
|
|
// from an error, resulting in it getting stuck, because we try to
|
2020-06-28 16:42:44 -05:00
|
|
|
// be resilient against failures.
|
2020-06-28 16:01:28 -05:00
|
|
|
//
|
|
|
|
// Because cargo only outputs one JSON object per line, we can
|
|
|
|
// simply skip a line if it doesn't parse, which just ignores any
|
|
|
|
// erroneus output.
|
2020-06-28 16:42:44 -05:00
|
|
|
let stdout = BufReader::new(self.child_stdout);
|
2020-06-28 16:01:28 -05:00
|
|
|
let mut read_at_least_one_message = false;
|
|
|
|
for message in cargo_metadata::Message::parse_stream(stdout) {
|
|
|
|
let message = match message {
|
|
|
|
Ok(message) => message,
|
|
|
|
Err(err) => {
|
|
|
|
log::error!("Invalid json from cargo check, ignoring ({})", err);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
read_at_least_one_message = true;
|
|
|
|
|
|
|
|
// Skip certain kinds of messages to only spend time on what's useful
|
|
|
|
match &message {
|
2020-06-28 16:42:44 -05:00
|
|
|
cargo_metadata::Message::CompilerArtifact(artifact) if artifact.fresh => (),
|
2020-06-28 16:01:28 -05:00
|
|
|
cargo_metadata::Message::BuildScriptExecuted(_)
|
2020-06-28 16:42:44 -05:00
|
|
|
| cargo_metadata::Message::Unknown => (),
|
|
|
|
_ => self.sender.send(message).unwrap(),
|
2020-06-28 16:01:28 -05:00
|
|
|
}
|
|
|
|
}
|
2020-06-28 16:42:44 -05:00
|
|
|
Ok(read_at_least_one_message)
|
2020-06-28 16:01:28 -05:00
|
|
|
}
|
2020-03-16 07:43:29 -05:00
|
|
|
}
|
2020-06-28 13:00:04 -05:00
|
|
|
|
2020-06-28 16:42:44 -05:00
|
|
|
struct JodChild(process::Child);
|
2020-06-28 13:00:04 -05:00
|
|
|
|
2020-06-28 16:42:44 -05:00
|
|
|
impl ops::Deref for JodChild {
|
2020-06-28 13:00:04 -05:00
|
|
|
type Target = process::Child;
|
|
|
|
fn deref(&self) -> &process::Child {
|
|
|
|
&self.0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-28 16:42:44 -05:00
|
|
|
impl ops::DerefMut for JodChild {
|
2020-06-28 13:00:04 -05:00
|
|
|
fn deref_mut(&mut self) -> &mut process::Child {
|
|
|
|
&mut self.0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-28 16:42:44 -05:00
|
|
|
impl Drop for JodChild {
|
2020-06-28 13:00:04 -05:00
|
|
|
fn drop(&mut self) {
|
|
|
|
let _ = self.0.kill();
|
|
|
|
}
|
|
|
|
}
|