mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor, add ui.cursor.primary

Browse source
This commit is contained in:
wojciechkepka 2021-06-21 18:01:35 +02:00 • committed by Blaž Hrastnik
parent d70be55f70
commit c534fdefdc
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
book/src/themes.md
View file

@ -79,6 +79,7 @@ Possible keys:
| `ui.cursor.insert` | | | `ui.cursor.insert` | |
| `ui.cursor.select` | | | `ui.cursor.select` | |
| `ui.cursor.match` | Matching bracket etc. | | `ui.cursor.match` | Matching bracket etc. |
| `ui.cursor.primary` | Cursor with primary selection |
| `ui.linenr` | | | `ui.linenr` | |
| `ui.statusline` | | | `ui.statusline` | |
| `ui.statusline.inactive` | | | `ui.statusline.inactive` | |

39
helix-term/src/ui/editor.rs
View file

@ -281,22 +281,23 @@ impl EditorView {
let end = text.line_to_char(last_line + 1); let end = text.line_to_char(last_line + 1);
Range::new(start, end) Range::new(start, end)
}; };
let scope = match doc.mode() {
Mode::Insert => "ui.cursor.insert", let base_cursor_style = theme
Mode::Select => "ui.cursor.select", .try_get("ui.cursor")
Mode::Normal => "ui.cursor", .unwrap_or_else(|| Style::default().add_modifier(Modifier::REVERSED));
}; let cursor_style = match doc.mode() {
let cursor_style = theme.try_get(scope).unwrap_or_else(|| { Mode::Insert => theme.try_get("ui.cursor.insert"),
theme Mode::Select => theme.try_get("ui.cursor.select"),
//if cursor.insert or cursor.select was not present try to default to cursor Mode::Normal => Some(base_cursor_style),
.try_get("ui.cursor") }
.unwrap_or_else(|| Style::default().add_modifier(Modifier::REVERSED)) .unwrap_or(base_cursor_style);
}); let primary_cursor_style = theme.try_get("ui.cursor.primary").unwrap_or(cursor_style);
let selection_style = theme.get("ui.selection"); let selection_style = theme.get("ui.selection");
let primary_style = theme let primary_selection_style = theme
.try_get("ui.selection.primary") .try_get("ui.selection.primary")
.unwrap_or(selection_style); .unwrap_or(selection_style);
let selection = doc.selection(view.id); let selection = doc.selection(view.id);
let primary_idx = selection.primary_index(); let primary_idx = selection.primary_index();
@ -309,10 +310,10 @@ impl EditorView {
let mut start = view.screen_coords_at_pos(doc, text, selection.anchor); let mut start = view.screen_coords_at_pos(doc, text, selection.anchor);
let mut end = view.screen_coords_at_pos(doc, text, selection.head); let mut end = view.screen_coords_at_pos(doc, text, selection.head);
let style = if i != primary_idx { let (cursor_style, selection_style) = if i == primary_idx {
selection_style (primary_cursor_style, primary_selection_style)
} else { } else {
primary_style (cursor_style, selection_style)
}; };
let head = end; let head = end;
@ -342,7 +343,7 @@ impl EditorView {
), ),
1, 1,
), ),
style, selection_style,
); );
} else { } else {
surface.set_style( surface.set_style(
@ -353,7 +354,7 @@ impl EditorView {
viewport.width.saturating_sub(start.col as u16), viewport.width.saturating_sub(start.col as u16),
1, 1,
), ),
style, selection_style,
); );
for i in start.row + 1..end.row { for i in start.row + 1..end.row {
surface.set_style( surface.set_style(
@ -364,7 +365,7 @@ impl EditorView {
viewport.width, viewport.width,
1, 1,
), ),
style, selection_style,
); );
} }
surface.set_style( surface.set_style(
@ -374,7 +375,7 @@ impl EditorView {
(end.col as u16).min(viewport.width), (end.col as u16).min(viewport.width),
1, 1,
), ),
style, selection_style,
); );
} }