Simplify

Kirill Bulatov created 1 week ago

Change summary

crates/editor/src/display_map.rs | 14 ++++++++------
crates/editor/src/editor.rs      |  2 +-
2 files changed, 9 insertions(+), 7 deletions(-)

Detailed changes

crates/editor/src/display_map.rs

@@ -521,18 +521,20 @@ impl DisplayMap {
     }
 
     pub fn clear_highlights(&mut self, type_id: TypeId) -> bool {
-        let mut cleared = false;
-
+        let mut cleared = self
+            .text_highlights
+            .remove(HighlightKey::Type(type_id))
+            .is_some();
         self.text_highlights.retain(|key, _| {
-            let retain = match key {
-                HighlightKey::Type(key_type_id) => key_type_id != &type_id,
-                HighlightKey::TypePlus(key_type_id, _) => key_type_id != &type_id,
+            let retain = if let HighlightKey::TypePlus(key_type_id, _) = key {
+                key_type_id != &type_id
+            } else {
+                true
             };
             cleared |= !retain;
             retain
         });
         cleared |= self.inlay_highlights.remove(&type_id).is_some();
-
         cleared
     }
 

crates/editor/src/editor.rs

@@ -20935,7 +20935,7 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         self.display_map.update(cx, |map, _| {
-            map.highlight_text(HighlightKey::Type(TypeId::of::<T>()), ranges, style)
+            map.highlight_text(HighlightKey::Type(TypeId::of::<T>()), ranges, style, false)
         });
         cx.notify();
     }