ensure highlight scopes are skipped properly

pascalkuthe · AlexanderDickie · commit 104099074681 · 2024-07-03T09:31:09.000+01:00
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
@@ -300,12 +300,12 @@ pub fn render_text<'t>(
         }
 
         // acquire the correct grapheme style
-        if char_pos >= syntax_style_span.1 {
+        while char_pos >= syntax_style_span.1 {
             syntax_style_span = syntax_styles
                 .next()
                 .unwrap_or((Style::default(), usize::MAX));
         }
-        if char_pos >= overlay_style_span.1 {
+        while char_pos >= overlay_style_span.1 {
             overlay_style_span = overlay_styles
                 .next()
                 .unwrap_or((Style::default(), usize::MAX));

Original file line number	Diff line number	Diff line change
`@@ -300,12 +300,12 @@ pub fn render_text<'t>(`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`// acquire the correct grapheme style`
`303`		`- if char_pos >= syntax_style_span.1 {`
	`303`	`+ while char_pos >= syntax_style_span.1 {`
`304`	`304`	`syntax_style_span = syntax_styles`
`305`	`305`	`.next()`
`306`	`306`	`.unwrap_or((Style::default(), usize::MAX));`
`307`	`307`	`}`
`308`		`- if char_pos >= overlay_style_span.1 {`
	`308`	`+ while char_pos >= overlay_style_span.1 {`
`309`	`309`	`overlay_style_span = overlay_styles`
`310`	`310`	`.next()`
`311`	`311`	`.unwrap_or((Style::default(), usize::MAX));`