git.iko.soy/helix
on master help sign in
feat: relative numbers (#485)
7892349Grzegorz Baranski
helix-term/src/ui/editor.rs+24−2
compare with master
unifiedsplit
@@ -17,6 +17,7 @@ use helix_core::{
17};
17};
18use helix_view::{
18use helix_view::{
19 document::Mode,
19 document::Mode,
20+ editor::LineNumber,
20 graphics::{CursorKind, Modifier, Rect, Style},
21 graphics::{CursorKind, Modifier, Rect, Style},
21 info::Info,
22 info::Info,
22 input::KeyEvent,
23 input::KeyEvent,
@@ -71,6 +72,7 @@ impl EditorView {
71 theme: &Theme,
72 theme: &Theme,
72 is_focused: bool,
73 is_focused: bool,
73 loader: &syntax::Loader,
74 loader: &syntax::Loader,
75+ config: &helix_view::editor::Config,
74 ) {
76 ) {
75 let area = Rect::new(
77 let area = Rect::new(
76 view.area.x + GUTTER_OFFSET,
78 view.area.x + GUTTER_OFFSET,
@@ -93,7 +95,7 @@ impl EditorView {
93 };
95 };
94
96
95 Self::render_text_highlights(doc, offset, area, surface, theme, highlights);
97 Self::render_text_highlights(doc, offset, area, surface, theme, highlights);
96− Self::render_gutter(doc, view, area, surface, theme);
98+ Self::render_gutter(doc, view, area, surface, theme, config);
97
99
98 if is_focused {
100 if is_focused {
99 Self::render_focused_view_elements(view, doc, area, theme, surface);
101 Self::render_focused_view_elements(view, doc, area, theme, surface);
@@ -459,6 +461,7 @@ impl EditorView {
459 viewport: Rect,
461 viewport: Rect,
460 surface: &mut Surface,
462 surface: &mut Surface,
461 theme: &Theme,
463 theme: &Theme,
464+ config: &helix_view::editor::Config,
462 ) {
465 ) {
463 let text = doc.text().slice(..);
466 let text = doc.text().slice(..);
464 let last_line = view.last_line(doc);
467 let last_line = view.last_line(doc);
@@ -473,6 +476,9 @@ impl EditorView {
473 // document or not. We only draw it if it's not an empty line.
476 // document or not. We only draw it if it's not an empty line.
474 let draw_last = text.line_to_byte(last_line) < text.len_bytes();
477 let draw_last = text.line_to_byte(last_line) < text.len_bytes();
475
478
479+ let current_line = doc
480+ .text()
481+ .char_to_line(doc.selection(view.id).primary().anchor);
476 for (i, line) in (view.first_line..(last_line + 1)).enumerate() {
482 for (i, line) in (view.first_line..(last_line + 1)).enumerate() {
477 use helix_core::diagnostic::Severity;
483 use helix_core::diagnostic::Severity;
478 if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) {
484 if let Some(diagnostic) = doc.diagnostics().iter().find(|d| d.line == line) {
@@ -495,7 +501,13 @@ impl EditorView {
495 let line_number_text = if line == last_line && !draw_last {
501 let line_number_text = if line == last_line && !draw_last {
496 " ~".into()
502 " ~".into()
497 } else {
503 } else {
504+ match config.line_number {
498− format!("{:>5}", line + 1)
505+ LineNumber::Absolute => format!("{:>5}", line + 1),
506+ LineNumber::Relative => {
507+ let relative_line = abs_diff(current_line, line);
508+ format!("{:>5}", relative_line)
509+ }
510+ }
499 };
511 };
500 surface.set_stringn(
512 surface.set_stringn(
501 viewport.x + 1 - GUTTER_OFFSET,
513 viewport.x + 1 - GUTTER_OFFSET,
@@ -1042,6 +1054,7 @@ impl Component for EditorView {
1042 &cx.editor.theme,
1054 &cx.editor.theme,
1043 is_focused,
1055 is_focused,
1044 loader,
1056 loader,
1057+ &cx.editor.config,
1045 );
1058 );
1046 }
1059 }
1047
1060
@@ -1115,3 +1128,12 @@ fn canonicalize_key(key: &mut KeyEvent) {
1115 key.modifiers.remove(KeyModifiers::SHIFT)
1128 key.modifiers.remove(KeyModifiers::SHIFT)
1116 }
1129 }
1117}
1130}
1131+
1132+#[inline]
1133+fn abs_diff(a: usize, b: usize) -> usize {
1134+ if a > b {
1135+ a - b
1136+ } else {
1137+ b - a
1138+ }
1139+}
helix-view/src/editor.rs+13
@@ -33,16 +33,29 @@ pub struct Config {
33 pub scroll_lines: isize,
33 pub scroll_lines: isize,
34 /// Mouse support. Defaults to true.
34 /// Mouse support. Defaults to true.
35 pub mouse: bool,
35 pub mouse: bool,
36+ /// Line number mode.
37+ pub line_number: LineNumber,
36 /// Middle click paste support. Defaults to true
38 /// Middle click paste support. Defaults to true
37 pub middle_click_paste: bool,
39 pub middle_click_paste: bool,
38}
40}
39
41
42+#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
43+#[serde(rename_all = "kebab-case")]
44+pub enum LineNumber {
45+ /// Show absolute line number
46+ Absolute,
47+
48+ /// Show relative line number to the primary cursor
49+ Relative,
50+}
51+
40impl Default for Config {
52impl Default for Config {
41 fn default() -> Self {
53 fn default() -> Self {
42 Self {
54 Self {
43 scrolloff: 5,
55 scrolloff: 5,
44 scroll_lines: 3,
56 scroll_lines: 3,
45 mouse: true,
57 mouse: true,
58+ line_number: LineNumber::Absolute,
46 middle_click_paste: true,
59 middle_click_paste: true,
47 }
60 }
48 }
61 }