settings: Follow-up fix to show more errors (#18123)
The condition added in #18122 was too strict. Release Notes: - N/A
This commit is contained in:
parent
ace4d5185d
commit
97708fdf43
1 changed files with 19 additions and 17 deletions
|
@ -629,15 +629,17 @@ fn handle_settings_changed(error: Option<anyhow::Error>, cx: &mut AppContext) {
|
|||
for workspace in workspace::local_workspace_windows(cx) {
|
||||
workspace
|
||||
.update(cx, |workspace, cx| {
|
||||
match error
|
||||
.as_ref()
|
||||
.and_then(|error| error.downcast_ref::<InvalidSettingsError>())
|
||||
match error.as_ref() {
|
||||
Some(error) => {
|
||||
if let Some(InvalidSettingsError::LocalSettings { .. }) =
|
||||
error.downcast_ref::<InvalidSettingsError>()
|
||||
{
|
||||
Some(InvalidSettingsError::UserSettings { message }) => {
|
||||
// Local settings will be displayed by the projects
|
||||
} else {
|
||||
workspace.show_notification(id.clone(), cx, |cx| {
|
||||
cx.new_view(|_| {
|
||||
MessageNotification::new(format!(
|
||||
"Invalid user settings file\n{message}"
|
||||
"Invalid user settings file\n{error}"
|
||||
))
|
||||
.with_click_message("Open settings file")
|
||||
.on_click(|cx| {
|
||||
|
@ -647,8 +649,8 @@ fn handle_settings_changed(error: Option<anyhow::Error>, cx: &mut AppContext) {
|
|||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
None => workspace.dismiss_notification(&id, cx),
|
||||
_ => {}
|
||||
}
|
||||
})
|
||||
.log_err();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue