From d989b2260b21f7d52b972b069c8fbc6e30f16113 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Thu, 29 May 2025 13:04:27 +0300 Subject: [PATCH] Do not react on settings change for disabled minimaps (#31677) Turning minimap on during debug sessions would cause the console editor to gain the minimap, despite it being explicitly disabled in the code. Release Notes: - N/A --- crates/editor/src/editor.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 3875f5f8507e8709846b0c1503223d7a6f051f60..ed0a267db0f6f697bffc7a76d12da06420f91d0e 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -18635,16 +18635,20 @@ impl Editor { } let minimap_settings = EditorSettings::get_global(cx).minimap; - if self.minimap_visibility.settings_visibility() != minimap_settings.minimap_enabled() { - self.set_minimap_visibility( - MinimapVisibility::for_mode(self.mode(), cx), - window, - cx, - ); - } else if let Some(minimap_entity) = self.minimap.as_ref() { - minimap_entity.update(cx, |minimap_editor, cx| { - minimap_editor.update_minimap_configuration(minimap_settings, cx) - }) + if self.minimap_visibility != MinimapVisibility::Disabled { + if self.minimap_visibility.settings_visibility() + != minimap_settings.minimap_enabled() + { + self.set_minimap_visibility( + MinimapVisibility::for_mode(self.mode(), cx), + window, + cx, + ); + } else if let Some(minimap_entity) = self.minimap.as_ref() { + minimap_entity.update(cx, |minimap_editor, cx| { + minimap_editor.update_minimap_configuration(minimap_settings, cx) + }) + } } }