mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-11-10 23:24:29 +00:00
Automatically reload project on config change
This commit is contained in:
parent
298adb27b9
commit
a03cfa4926
3 changed files with 8 additions and 5 deletions
|
@ -10,7 +10,7 @@ use serde::{de, Deserialize};
|
|||
use stdx::split_delim;
|
||||
|
||||
/// Roots and crates that compose this Rust project.
|
||||
#[derive(Clone, Debug)]
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
pub struct ProjectJson {
|
||||
pub(crate) roots: Vec<Root>,
|
||||
pub(crate) crates: Vec<Crate>,
|
||||
|
@ -18,14 +18,14 @@ pub struct ProjectJson {
|
|||
|
||||
/// A root points to the directory which contains Rust crates. rust-analyzer watches all files in
|
||||
/// all roots. Roots might be nested.
|
||||
#[derive(Clone, Debug)]
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
pub struct Root {
|
||||
pub(crate) path: AbsPathBuf,
|
||||
}
|
||||
|
||||
/// A crate points to the root module of a crate and lists the dependencies of the crate. This is
|
||||
/// useful in creating the crate graph.
|
||||
#[derive(Clone, Debug)]
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
pub struct Crate {
|
||||
pub(crate) root_module: AbsPathBuf,
|
||||
pub(crate) edition: Edition,
|
||||
|
|
|
@ -44,7 +44,7 @@ pub struct Config {
|
|||
pub root_path: AbsPathBuf,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Eq, PartialEq)]
|
||||
pub enum LinkedProject {
|
||||
ProjectManifest(ProjectManifest),
|
||||
InlineJsonProject(ProjectJson),
|
||||
|
|
|
@ -19,11 +19,14 @@ impl GlobalState {
|
|||
if self.config.lru_capacity != old_config.lru_capacity {
|
||||
self.analysis_host.update_lru_capacity(old_config.lru_capacity);
|
||||
}
|
||||
if self.config.flycheck != old_config.flycheck {
|
||||
if self.config.linked_projects != old_config.linked_projects {
|
||||
self.reload()
|
||||
} else if self.config.flycheck != old_config.flycheck {
|
||||
self.reload_flycheck();
|
||||
}
|
||||
}
|
||||
pub(crate) fn reload(&mut self) {
|
||||
log::info!("reloading projects: {:?}", self.config.linked_projects);
|
||||
let workspaces = {
|
||||
if self.config.linked_projects.is_empty()
|
||||
&& self.config.notifications.cargo_toml_not_found
|
||||
|
|
Loading…
Reference in a new issue