git.iko.soy/helix
on master help sign in
Manually draw all block cursors
c0bbadcGokul Soumya
book/src/themes.md+1
compare with master
unifiedsplit
@@ -188,6 +188,7 @@ These scopes are used for theming the editor interface.
188| `ui.cursor.insert` | |
188| `ui.cursor.insert` | |
189| `ui.cursor.select` | |
189| `ui.cursor.select` | |
190| `ui.cursor.match` | Matching bracket etc. |
190| `ui.cursor.match` | Matching bracket etc. |
191+| `ui.cursor.primary` | Cursor with primary selection |
191| `ui.linenr` | |
192| `ui.linenr` | |
192| `ui.linenr.selected` | |
193| `ui.linenr.selected` | |
193| `ui.statusline` | Statusline |
194| `ui.statusline` | Statusline |
helix-syntax/languages/tree-sitter-scala+1−1

Submodule changed.

helix-term/src/ui/editor.rs+27−14
@@ -17,6 +17,7 @@ use helix_core::{
17};
17};
18use helix_view::{
18use helix_view::{
19 document::{Mode, SCRATCH_BUFFER_NAME},
19 document::{Mode, SCRATCH_BUFFER_NAME},
20+ editor::CursorShapeConfig,
20 graphics::{CursorKind, Modifier, Rect, Style},
21 graphics::{CursorKind, Modifier, Rect, Style},
21 info::Info,
22 info::Info,
22 input::KeyEvent,
23 input::KeyEvent,
@@ -79,7 +80,7 @@ impl EditorView {
79 let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
80 let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
80 Box::new(syntax::merge(
81 Box::new(syntax::merge(
81 highlights,
82 highlights,
82− Self::doc_selection_highlights(doc, view, theme),
83+ Self::doc_selection_highlights(doc, view, theme, &config.cursor_shape),
83 ))
84 ))
84 } else {
85 } else {
85 Box::new(highlights)
86 Box::new(highlights)
@@ -213,11 +214,16 @@ impl EditorView {
213 doc: &Document,
214 doc: &Document,
214 view: &View,
215 view: &View,
215 theme: &Theme,
216 theme: &Theme,
217+ cursor_shape_config: &CursorShapeConfig,
216 ) -> Vec<(usize, std::ops::Range<usize>)> {
218 ) -> Vec<(usize, std::ops::Range<usize>)> {
217 let text = doc.text().slice(..);
219 let text = doc.text().slice(..);
218 let selection = doc.selection(view.id);
220 let selection = doc.selection(view.id);
219 let primary_idx = selection.primary_index();
221 let primary_idx = selection.primary_index();
220
222
223+ let mode = doc.mode();
224+ let cursorkind = cursor_shape_config.from_mode(mode);
225+ let cursor_is_block = cursorkind == CursorKind::Block;
226+
221 let selection_scope = theme
227 let selection_scope = theme
222 .find_scope_index("ui.selection")
228 .find_scope_index("ui.selection")
223 .expect("could not find `ui.selection` scope in the theme!");
229 .expect("could not find `ui.selection` scope in the theme!");
@@ -225,13 +231,16 @@ impl EditorView {
225 .find_scope_index("ui.cursor")
231 .find_scope_index("ui.cursor")
226 .unwrap_or(selection_scope);
232 .unwrap_or(selection_scope);
227
233
228− let cursor_scope = match doc.mode() {
234+ let cursor_scope = match mode {
229 Mode::Insert => theme.find_scope_index("ui.cursor.insert"),
235 Mode::Insert => theme.find_scope_index("ui.cursor.insert"),
230 Mode::Select => theme.find_scope_index("ui.cursor.select"),
236 Mode::Select => theme.find_scope_index("ui.cursor.select"),
231 Mode::Normal => Some(base_cursor_scope),
237 Mode::Normal => Some(base_cursor_scope),
232 }
238 }
233 .unwrap_or(base_cursor_scope);
239 .unwrap_or(base_cursor_scope);
234
240
241+ let primary_cursor_scope = theme
242+ .find_scope_index("ui.cursor.primary")
243+ .unwrap_or(cursor_scope);
235 let primary_selection_scope = theme
244 let primary_selection_scope = theme
236 .find_scope_index("ui.selection.primary")
245 .find_scope_index("ui.selection.primary")
237 .unwrap_or(selection_scope);
246 .unwrap_or(selection_scope);
@@ -239,16 +248,20 @@ impl EditorView {
239 let mut spans: Vec<(usize, std::ops::Range<usize>)> = Vec::new();
248 let mut spans: Vec<(usize, std::ops::Range<usize>)> = Vec::new();
240 for (i, range) in selection.iter().enumerate() {
249 for (i, range) in selection.iter().enumerate() {
241 let selection_is_primary = i == primary_idx;
250 let selection_is_primary = i == primary_idx;
242− let selection_scope = if selection_is_primary {
251+ let (cursor_scope, selection_scope) = if selection_is_primary {
243− primary_selection_scope
252+ (primary_cursor_scope, primary_selection_scope)
244 } else {
253 } else {
245− selection_scope
254+ (cursor_scope, selection_scope)
246 };
255 };
247
256
248 // Special-case: cursor at end of the rope.
257 // Special-case: cursor at end of the rope.
249 if range.head == range.anchor && range.head == text.len_chars() {
258 if range.head == range.anchor && range.head == text.len_chars() {
250− if !selection_is_primary {
259+ if !selection_is_primary || cursor_is_block {
251− // Terminal cursor acts as the primary cursor
260+ // Bar and underline cursors are drawn by the terminal
261+ // BUG: If the editor area loses focus while having a bar or
262+ // underline cursor (eg. when a regex prompt has focus) then
263+ // the primary cursor will be invisible. This doesn't happen
264+ // with block cursors since we manually draw *all* cursors.
252 spans.push((cursor_scope, range.head..range.head + 1));
265 spans.push((cursor_scope, range.head..range.head + 1));
253 }
266 }
254 continue;
267 continue;
@@ -259,13 +272,13 @@ impl EditorView {
259 // Standard case.
272 // Standard case.
260 let cursor_start = prev_grapheme_boundary(text, range.head);
273 let cursor_start = prev_grapheme_boundary(text, range.head);
261 spans.push((selection_scope, range.anchor..cursor_start));
274 spans.push((selection_scope, range.anchor..cursor_start));
262− if !selection_is_primary {
275+ if !selection_is_primary || cursor_is_block {
263 spans.push((cursor_scope, cursor_start..range.head));
276 spans.push((cursor_scope, cursor_start..range.head));
264 }
277 }
265 } else {
278 } else {
266 // Reverse case.
279 // Reverse case.
267 let cursor_end = next_grapheme_boundary(text, range.head);
280 let cursor_end = next_grapheme_boundary(text, range.head);
268− if !selection_is_primary {
281+ if !selection_is_primary || cursor_is_block {
269 spans.push((cursor_scope, range.head..cursor_end));
282 spans.push((cursor_scope, range.head..cursor_end));
270 }
283 }
271 spans.push((selection_scope, cursor_end..range.anchor));
284 spans.push((selection_scope, cursor_end..range.anchor));
@@ -1140,11 +1153,11 @@ impl Component for EditorView {
1140 }
1153 }
1141
1154
1142 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1155 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1143− // match view.doc.mode() {
1156+ match editor.cursor() {
1144− // Mode::Insert => write!(stdout, "\x1B[6 q"),
1157+ // All block cursors are drawn manually
1145− // mode => write!(stdout, "\x1B[2 q"),
1158+ (pos, CursorKind::Block) => (pos, CursorKind::Hidden),
1159+ cursor => cursor,
1146− // };
1160+ }
1147− editor.cursor()
1148 }
1161 }
1149}
1162}
1150
1163
helix-view/src/editor.rs+7−6
@@ -116,6 +116,12 @@ pub struct Config {
116#[derive(Debug, Clone, PartialEq)]
116#[derive(Debug, Clone, PartialEq)]
117pub struct CursorShapeConfig([CursorKind; 3]);
117pub struct CursorShapeConfig([CursorKind; 3]);
118
118
119+impl CursorShapeConfig {
120+ pub fn from_mode(&self, mode: Mode) -> CursorKind {
121+ self.get(mode as usize).copied().unwrap_or_default()
122+ }
123+}
124+
119impl<'de> Deserialize<'de> for CursorShapeConfig {
125impl<'de> Deserialize<'de> for CursorShapeConfig {
120 fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
126 fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
121 where
127 where
@@ -647,12 +653,7 @@ impl Editor {
647 let inner = view.inner_area();
653 let inner = view.inner_area();
648 pos.col += inner.x as usize;
654 pos.col += inner.x as usize;
649 pos.row += inner.y as usize;
655 pos.row += inner.y as usize;
650− let cursorkind = self
656+ let cursorkind = self.config.cursor_shape.from_mode(doc.mode());
651− .config
652− .cursor_shape
653− .get(doc.mode() as usize)
654− .copied()
655− .unwrap_or_default();
656 (Some(pos), cursorkind)
657 (Some(pos), cursorkind)
657 } else {
658 } else {
658 (None, CursorKind::default())
659 (None, CursorKind::default())