Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editor: Use highlight_text to highlight matching brackets, fix unnecessary inlay hint highlighting (#36540)

Browse source 
Closes #35981

Release Notes:

- Fixed bracket highlights overly including parts of inlays when
highlighting

Before -
<img width="1480" height="602" alt="Screenshot from 2025-08-19 17-15-06"
src="https://github.com/user-attachments/assets/8e6b5ed8-f133-4867-8352-ed93441fbd8b"
/>

After -
<img width="1480" height="602" alt="Screenshot from 2025-08-19 17-24-26"
src="https://github.com/user-attachments/assets/1314e54e-ecf9-4280-9d53-eed6e96e393f"
/>
This commit is contained in:
Sachith Shetty 2025-08-20 23:27:41 -07:00 • committed by GitHub
parent 5dcb90858e
commit 68f97d6069
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/editor/src/highlight_matching_bracket.rs
View file

@ -1,6 +1,7 @@
use crate::{Editor, RangeToAnchorExt}; use crate::{Editor, RangeToAnchorExt};
use gpui::{Context, Window}; use gpui::{Context, HighlightStyle, Window};
use language::CursorShape; use language::CursorShape;
use theme::ActiveTheme;
enum MatchingBracketHighlight {} enum MatchingBracketHighlight {}
@ -9,7 +10,7 @@ pub fn refresh_matching_bracket_highlights(
window: &mut Window, window: &mut Window,
cx: &mut Context<Editor>, cx: &mut Context<Editor>,
) { ) {
editor.clear_background_highlights::<MatchingBracketHighlight>(cx); editor.clear_highlights::<MatchingBracketHighlight>(cx);
let newest_selection = editor.selections.newest::<usize>(cx); let newest_selection = editor.selections.newest::<usize>(cx);
// Don't highlight brackets if the selection isn't empty // Don't highlight brackets if the selection isn't empty
@ -35,12 +36,19 @@ pub fn refresh_matching_bracket_highlights(
.buffer_snapshot .buffer_snapshot
.innermost_enclosing_bracket_ranges(head..tail, None) .innermost_enclosing_bracket_ranges(head..tail, None)
{ {
editor.highlight_background::<MatchingBracketHighlight>( editor.highlight_text::<MatchingBracketHighlight>(
&[ vec![
opening_range.to_anchors(&snapshot.buffer_snapshot), opening_range.to_anchors(&snapshot.buffer_snapshot),
closing_range.to_anchors(&snapshot.buffer_snapshot), closing_range.to_anchors(&snapshot.buffer_snapshot),
], ],
|theme| theme.colors().editor_document_highlight_bracket_background, HighlightStyle {
background_color: Some(
cx.theme()
.colors()
.editor_document_highlight_bracket_background,
),
..Default::default()
},
cx, cx,
) )
} }
@ -104,7 +112,7 @@ mod tests {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
"#}); "#});
cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#" cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
pub fn test«(»"Test argument"«)» { pub fn test«(»"Test argument"«)» {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
@ -115,7 +123,7 @@ mod tests {
another_test(1, ˇ2, 3); another_test(1, ˇ2, 3);
} }
"#}); "#});
cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#" cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
pub fn test("Test argument") { pub fn test("Test argument") {
another_test«(»1, 2, 3«)»; another_test«(»1, 2, 3«)»;
} }
@ -126,7 +134,7 @@ mod tests {
anotherˇ_test(1, 2, 3); anotherˇ_test(1, 2, 3);
} }
"#}); "#});
cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#" cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
pub fn test("Test argument") «{» pub fn test("Test argument") «{»
another_test(1, 2, 3); another_test(1, 2, 3);
«}» «}»
@ -138,7 +146,7 @@ mod tests {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
"#}); "#});
cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#" cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
pub fn test("Test argument") { pub fn test("Test argument") {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
@ -150,8 +158,8 @@ mod tests {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
"#}); "#});
cx.assert_editor_background_highlights::<MatchingBracketHighlight>(indoc! {r#" cx.assert_editor_text_highlights::<MatchingBracketHighlight>(indoc! {r#"
pub fn test("Test argument") { pub fn test«("Test argument") {
another_test(1, 2, 3); another_test(1, 2, 3);
} }
"#}); "#});