andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 19:03:30 +04:00
Code Issues Projects Releases Wiki Activity

Fix highlighting in picker with multiple columns (#6333)

Browse Source
This commit is contained in:
exp80 2023-03-18 17:16:40 +01:00 committed by GitHub
parent ac2a7731a6
commit 770496511c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helix-term/src/ui/picker.rs
View File

@ -812,7 +812,10 @@ fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
for cell in row.cells.iter_mut() { for cell in row.cells.iter_mut() {
let spans = match cell.content.lines.get(0) { let spans = match cell.content.lines.get(0) {
Some(s) => s, Some(s) => s,
None => continue, None => {
cell_start_byte_offset += TEMP_CELL_SEP.len();
continue;
}
}; };
let mut cell_len = 0; let mut cell_len = 0;

4
helix-tui/src/text.rs
View File

@ -453,10 +453,12 @@ fn from(text: &Text<'a>) -> String {
let mut output = String::with_capacity(size); let mut output = String::with_capacity(size);
for spans in &text.lines { for spans in &text.lines {
if !output.is_empty() {
output.push('\n');
}
for span in &spans.0 { for span in &spans.0 {
output.push_str(&span.content); output.push_str(&span.content);
} }
output.push('\n');
} }
output output
} }