diff --git a/crates/editor/src/bracket_colorization.rs b/crates/editor/src/bracket_colorization.rs index 7c377f5d38e2194e8058280bbaa908ec70d8d03b..6770ddcbeb42c76e57934b0f65fbfb781ce6a877 100644 --- a/crates/editor/src/bracket_colorization.rs +++ b/crates/editor/src/bracket_colorization.rs @@ -48,7 +48,7 @@ impl Editor { } }) .filter_map(|pair| { - let id = pair.color_index?; + let color_index = pair.color_index?; let buffer_open_range = buffer_snapshot .anchor_before(pair.open_range.start) ..buffer_snapshot.anchor_after(pair.open_range.end); @@ -64,7 +64,7 @@ impl Editor { ..multi_buffer_snapshot .anchor_in_excerpt(excerpt_id, buffer_close_range.end)?; Some(( - id % accents_count, + color_index % accents_count, multi_buffer_open_range, multi_buffer_close_range, )) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index c8da05c872d5dd482537ddcb0c4363b01709b8fd..d149b8311cf8477d3fcc503d865b4501a38b5223 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -21092,7 +21092,6 @@ impl Editor { self.active_indent_guides_state.dirty = true; self.refresh_active_diagnostics(cx); self.refresh_code_actions(window, cx); - self.refresh_selected_text_highlights(true, window, cx); self.refresh_single_line_folds(window, cx); self.refresh_matching_bracket_highlights(window, cx); if self.has_active_edit_prediction() { @@ -21194,6 +21193,7 @@ impl Editor { } multi_buffer::Event::Reparsed(buffer_id) => { self.tasks_update_task = Some(self.refresh_runnables(window, cx)); + self.refresh_selected_text_highlights(true, window, cx); self.colorize_brackets(true, cx); jsx_tag_auto_close::refresh_enabled_in_any_buffer(self, multibuffer, cx); diff --git a/crates/languages/src/rust/brackets.scm b/crates/languages/src/rust/brackets.scm index baa3178e51f894d1bea1dfc5c1bb308c43f140a1..7a35adb10021c83b8e08e888187ab133c5313ad9 100644 --- a/crates/languages/src/rust/brackets.scm +++ b/crates/languages/src/rust/brackets.scm @@ -2,6 +2,6 @@ ("[" @open "]" @close) ("{" @open "}" @close) ("<" @open ">" @close) -(("\"" @open "\"" @close) (#set! rainbow.exclude)) (closure_parameters "|" @open "|" @close) -("'" @open "'" @close) +(("\"" @open "\"" @close) (#set! rainbow.exclude)) +(("'" @open "'" @close) (#set! rainbow.exclude))