Skip to content

Commit 65234e8

Browse files
committed
Remove workspaceLoaded setting
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.
1 parent 3232fd5 commit 65234e8

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

crates/rust-analyzer/src/config.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ pub enum FilesWatcher {
4949

5050
#[derive(Debug, Clone)]
5151
pub struct NotificationsConfig {
52-
pub workspace_loaded: bool,
5352
pub cargo_toml_not_found: bool,
5453
}
5554

@@ -83,10 +82,7 @@ impl Default for Config {
8382
lru_capacity: None,
8483
proc_macro_srv: None,
8584
files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
86-
notifications: NotificationsConfig {
87-
workspace_loaded: true,
88-
cargo_toml_not_found: true,
89-
},
85+
notifications: NotificationsConfig { cargo_toml_not_found: true },
9086

9187
cargo: CargoConfig::default(),
9288
rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
@@ -129,7 +125,6 @@ impl Config {
129125
Some("client") => FilesWatcher::Client,
130126
Some("notify") | _ => FilesWatcher::Notify
131127
};
132-
set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
133128
set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
134129

135130
set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);

crates/rust-analyzer/src/main_loop.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ fn loop_turn(
415415
});
416416
}
417417

418-
let show_progress =
419-
!loop_state.workspace_loaded && world_state.config.notifications.workspace_loaded;
418+
let show_progress = !loop_state.workspace_loaded;
420419

421420
if !loop_state.workspace_loaded
422421
&& loop_state.roots_scanned == loop_state.roots_total

editors/code/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,6 @@
205205
"default": [],
206206
"description": "Paths to exclude from analysis."
207207
},
208-
"rust-analyzer.notifications.workspaceLoaded": {
209-
"type": "boolean",
210-
"default": true,
211-
"markdownDescription": "Whether to show `workspace loaded` message."
212-
},
213208
"rust-analyzer.notifications.cargoTomlNotFound": {
214209
"type": "boolean",
215210
"default": true,

0 commit comments

Comments
 (0)