@@ -11,6 +11,8 @@ use helix_core::{
1111 visual_coords_at_pos, Position, RopeSlice, Selection,
1212};
1313
14+use std::fmt;
15+
1416type Jump = (DocumentId, Selection);
1517
1618#[derive(Debug, Clone)]
@@ -64,17 +66,11 @@ impl JumpList {
6466 }
6567}
6668
67−const GUTTERS: &[(Gutter, usize)] = &[
68− (gutter::diagnostics_or_breakpoints, 1),
69− (gutter::line_number, 5),
70−];
71−
72−#[derive(Debug)]
7369pub struct View {
7470 pub id: ViewId,
75− pub doc: DocumentId,
7671 pub offset: Position,
7772 pub area: Rect,
73+ pub doc: DocumentId,
7874 pub jumps: JumpList,
7975 /// the last accessed file before the current one
8076 pub last_accessed_doc: Option<DocumentId>,
@@ -85,10 +81,29 @@ pub struct View {
8581 pub last_modified_docs: [Option<DocumentId>; 2],
8682 /// used to store previous selections of tree-sitter objecs
8783 pub object_selections: Vec<Selection>,
84+ pub gutters: Vec<(Gutter, usize)>,
85+}
86+
87+impl fmt::Debug for View {
88+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
89+ f.debug_struct("View")
90+ .field("id", &self.id)
91+ .field("area", &self.area)
92+ .field("doc", &self.doc)
93+ .finish()
94+ }
8895}
8996
9097impl View {
91− pub fn new(doc: DocumentId) -> Self {
98+ pub fn new(doc: DocumentId, gutter_types: Vec<crate::editor::GutterType>) -> Self {
99+ let mut gutters: Vec<(Gutter, usize)> = vec![];
100+ use crate::editor::GutterType;
101+ for gutter_type in &gutter_types {
102+ match gutter_type {
103+ GutterType::Diagnostics => gutters.push((gutter::diagnostics_or_breakpoints, 1)),
104+ GutterType::LineNumbers => gutters.push((gutter::line_numbers, 5)),
105+ }
106+ }
92107 Self {
93108 id: ViewId::default(),
94109 doc,
@@ -98,17 +113,14 @@ impl View {
98113 last_accessed_doc: None,
99114 last_modified_docs: [None, None],
100115 object_selections: Vec::new(),
116+ gutters,
101117 }
102118 }
103119
104− pub fn gutters(&self) -> &[(Gutter, usize)] {
105− GUTTERS
106− }
107−
108120 pub fn inner_area(&self) -> Rect {
109121 // TODO: cache this
110122 let offset = self
111− .gutters()
123+ .gutters
112124 .iter()
113125 .map(|(_, width)| *width as u16)
114126 .sum::<u16>()
@@ -324,11 +336,16 @@ mod tests {
324336 use super::*;
325337 use helix_core::Rope;
326338 const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
327− // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
339+ const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
340+ // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
341+ use crate::editor::GutterType;
328342
329343 #[test]
330344 fn test_text_pos_at_screen_coords() {
331− let mut view = View::new(DocumentId::default());
345+ let mut view = View::new(
346+ DocumentId::default(),
347+ vec![GutterType::Diagnostics, GutterType::LineNumbers],
348+ );
332349 view.area = Rect::new(40, 40, 40, 40);
333350 let rope = Rope::from_str("abc\n\tdef");
334351 let text = rope.slice(..);
@@ -372,9 +389,36 @@ mod tests {
372389 assert_eq!(view.text_pos_at_screen_coords(&text, 41, 80, 4), Some(8));
373390 }
374391
392+ #[test]
393+ fn test_text_pos_at_screen_coords_without_line_numbers_gutter() {
394+ let mut view = View::new(DocumentId::default(), vec![GutterType::Diagnostics]);
395+ view.area = Rect::new(40, 40, 40, 40);
396+ let rope = Rope::from_str("abc\n\tdef");
397+ let text = rope.slice(..);
398+ assert_eq!(
399+ view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
400+ Some(4)
401+ );
402+ }
403+
404+ #[test]
405+ fn test_text_pos_at_screen_coords_without_any_gutters() {
406+ let mut view = View::new(DocumentId::default(), vec![]);
407+ view.area = Rect::new(40, 40, 40, 40);
408+ let rope = Rope::from_str("abc\n\tdef");
409+ let text = rope.slice(..);
410+ assert_eq!(
411+ view.text_pos_at_screen_coords(&text, 41, 40 + 1, 4),
412+ Some(4)
413+ );
414+ }
415+
375416 #[test]
376417 fn test_text_pos_at_screen_coords_cjk() {
377− let mut view = View::new(DocumentId::default());
418+ let mut view = View::new(
419+ DocumentId::default(),
420+ vec![GutterType::Diagnostics, GutterType::LineNumbers],
421+ );
378422 view.area = Rect::new(40, 40, 40, 40);
379423 let rope = Rope::from_str("Hi! こんにちは皆さん");
380424 let text = rope.slice(..);
@@ -411,7 +455,10 @@ mod tests {
411455
412456 #[test]
413457 fn test_text_pos_at_screen_coords_graphemes() {
414− let mut view = View::new(DocumentId::default());
458+ let mut view = View::new(
459+ DocumentId::default(),
460+ vec![GutterType::Diagnostics, GutterType::LineNumbers],
461+ );
415462 view.area = Rect::new(40, 40, 40, 40);
416463 let rope = Rope::from_str("Hèl̀l̀ò world!");
417464 let text = rope.slice(..);