Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove workspaceLoaded setting

Browse source 
The `workspaceLoaded` notification setting was originally designed to
control the display of a popup message that said:

  "workspace loaded, {} rust packages"

This popup was removed and replaced by a much sleeker message in the
VSCode status bar that provides a real-time status while loading:

  rust-analyzer: {}/{} packages

This was done as part of #3587

The new status-bar indicator is unobtrusive and shouldn't need to be
disabled.  So this setting is removed.
This commit is contained in:
Andrew Chin 2020-05-01 18:59:19 -04:00
parent 3232fd5179
commit 65234e8828
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,6 @@ pub enum FilesWatcher {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct NotificationsConfig { pub struct NotificationsConfig {
pub workspace_loaded: bool,
pub cargo_toml_not_found: bool, pub cargo_toml_not_found: bool,
} }
@ -83,10 +82,7 @@ impl Default for Config {
lru_capacity: None, lru_capacity: None,
proc_macro_srv: None, proc_macro_srv: None,
files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() }, files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
notifications: NotificationsConfig { notifications: NotificationsConfig { cargo_toml_not_found: true },
workspace_loaded: true,
cargo_toml_not_found: true,
},
cargo: CargoConfig::default(), cargo: CargoConfig::default(),
rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() }, rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
@ -129,7 +125,6 @@ impl Config {
Some("client") => FilesWatcher::Client, Some("client") => FilesWatcher::Client,
Some("notify") | _ => FilesWatcher::Notify Some("notify") | _ => FilesWatcher::Notify
}; };
set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found); set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features); set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);

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

@ -415,8 +415,7 @@ fn loop_turn(
}); });
} }
let show_progress = let show_progress = !loop_state.workspace_loaded;
!loop_state.workspace_loaded && world_state.config.notifications.workspace_loaded;
if !loop_state.workspace_loaded if !loop_state.workspace_loaded
&& loop_state.roots_scanned == loop_state.roots_total && loop_state.roots_scanned == loop_state.roots_total

5
editors/code/package.json
View file

@ -205,11 +205,6 @@
"default": [], "default": [],
"description": "Paths to exclude from analysis." "description": "Paths to exclude from analysis."
}, },
"rust-analyzer.notifications.workspaceLoaded": {
"type": "boolean",
"default": true,
"markdownDescription": "Whether to show `workspace loaded` message."
},
"rust-analyzer.notifications.cargoTomlNotFound": { "rust-analyzer.notifications.cargoTomlNotFound": {
"type": "boolean", "type": "boolean",
"default": true, "default": true,