language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Migrate to user-centric config name for cargo check stuff

Browse source
This commit is contained in:
Aleksey Kladov 2021-03-04 14:52:36 +03:00
parent 0ce539ec96
commit 3d80e0a154
5 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,8 +46,8 @@ config_data! {
cargo_allFeatures: bool = "false",
/// List of features to activate.
cargo_features: Vec<String> = "[]",
/// Run `cargo check` on startup to get the correct value for package
/// OUT_DIRs.
/// Run build scripts (`build.rs`) for more precise code analysis.
cargo_runBuildScripts |
cargo_loadOutDirsFromCheck: bool = "false",
/// Do not activate the `default` feature.
cargo_noDefaultFeatures: bool = "false",
@ -167,8 +167,7 @@ config_data! {
/// Whether to show `can't find Cargo.toml` error message.
notifications_cargoTomlNotFound: bool = "true",
/// Enable Proc macro support, `#rust-analyzer.cargo.loadOutDirsFromCheck#` must be
/// enabled.
/// Enable support for procedural macros, implies `#rust-analyzer.cargo.runBuildScripts#`.
procMacro_enable: bool = "false",
/// Internal config, path to proc-macro server executable (typically,
/// this is rust-analyzer itself, but we override this in tests).
@ -480,8 +479,8 @@ impl Config {
pub fn cargo_autoreload(&self) -> bool {
self.data.cargo_autoreload
}
pub fn load_out_dirs_from_check(&self) -> bool {
self.data.cargo_loadOutDirsFromCheck
pub fn run_build_scripts(&self) -> bool {
self.data.cargo_runBuildScripts || self.data.procMacro_enable
}
pub fn cargo(&self) -> CargoConfig {
let rustc_source = self.data.rustcSource.as_ref().map(|rustc_src| {

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

@ -312,7 +312,7 @@ impl GlobalState {
} else {
assert_eq!(n_done, n_total);
new_status = Status::Ready {
partial: self.config.load_out_dirs_from_check()
partial: self.config.run_build_scripts()
&& self.workspace_build_data.is_none()
|| config_version < self.vfs_config_version,
};

2
crates/rust-analyzer/src/reload.rs
View file

@ -337,7 +337,7 @@ impl GlobalState {
};
change.set_crate_graph(crate_graph);
if self.config.load_out_dirs_from_check() && workspace_build_data.is_none() {
if self.config.run_build_scripts() && workspace_build_data.is_none() {
let mut collector = BuildDataCollector::default();
for ws in &workspaces {
ws.collect_build_data_configs(&mut collector);