From d028319080d1360eea04fb59f21c68736e6de6cf Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:36:21 -0700
Subject: [PATCH 01/13] dynamically resize line number gutter width

---
 helix-term/src/ui/editor.rs | 13 ++++----
 helix-view/src/gutter.rs    | 66 ++++++++++++++++++++++++++++++++-----
 helix-view/src/view.rs      | 50 +++++++++-------------------
 3 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 6b3163748fa2..2b68f1edb6e4 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -638,22 +638,23 @@ impl EditorView {
         // avoid lots of small allocations by reusing a text buffer for each line
         let mut text = String::with_capacity(8);
 
-        for (constructor, width) in view.gutters() {
-            let gutter = constructor(editor, doc, view, theme, is_focused, *width);
-            text.reserve(*width); // ensure there's enough space for the gutter
+        for gutter_type in view.gutters() {
+            let gutter = gutter_type.row_styler(editor, doc, view, theme, is_focused);
+            let width = gutter_type.width(view);
+            text.reserve(width); // ensure there's enough space for the gutter
             for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
                 let selected = cursors.contains(&line);
                 let x = viewport.x + offset;
                 let y = viewport.y + i as u16;
 
                 if let Some(style) = gutter(line, selected, &mut text) {
-                    surface.set_stringn(x, y, &text, *width, gutter_style.patch(style));
+                    surface.set_stringn(x, y, &text, width, gutter_style.patch(style));
                 } else {
                     surface.set_style(
                         Rect {
                             x,
                             y,
-                            width: *width as u16,
+                            width: width as u16,
                             height: 1,
                         },
                         gutter_style,
@@ -662,7 +663,7 @@ impl EditorView {
                 text.clear();
             }
 
-            offset += *width as u16;
+            offset += width as u16;
         }
     }
 
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 8f7c306266a9..9a3a09eb1160 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -1,21 +1,53 @@
 use std::fmt::Write;
+use std::iter::successors;
 
 use crate::{
+    editor::GutterType,
     graphics::{Color, Modifier, Style},
     Document, Editor, Theme, View,
 };
 
+fn count_digits(n: usize) -> usize {
+    successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
+}
+
 pub type GutterFn<'doc> = Box<dyn Fn(usize, bool, &mut String) -> Option<Style> + 'doc>;
 pub type Gutter =
     for<'doc> fn(&'doc Editor, &'doc Document, &View, &Theme, bool, usize) -> GutterFn<'doc>;
 
+impl GutterType {
+    pub fn row_styler<'doc>(
+        self,
+        editor: &'doc Editor,
+        doc: &'doc Document,
+        view: &View,
+        theme: &Theme,
+        is_focused: bool,
+    ) -> GutterFn<'doc> {
+        match self {
+            GutterType::Diagnostics => {
+                diagnostics_or_breakpoints(editor, doc, view, theme, is_focused)
+            }
+            GutterType::LineNumbers => line_numbers(editor, doc, view, theme, is_focused),
+            GutterType::Spacer => padding(editor, doc, view, theme, is_focused),
+        }
+    }
+
+    pub fn width(self, view: &View) -> usize {
+        match self {
+            GutterType::Diagnostics => 1,
+            GutterType::LineNumbers => line_numbers_width(view),
+            GutterType::Spacer => 1,
+        }
+    }
+}
+
 pub fn diagnostic<'doc>(
     _editor: &'doc Editor,
     doc: &'doc Document,
     _view: &View,
     theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     let warning = theme.get("warning");
     let error = theme.get("error");
@@ -56,10 +88,13 @@ pub fn line_numbers<'doc>(
     view: &View,
     theme: &Theme,
     is_focused: bool,
-    width: usize,
 ) -> GutterFn<'doc> {
+    const ELLIPSIS: char = '\u{2026}';
+
     let text = doc.text().slice(..);
     let last_line = view.last_line(doc);
+    let width = line_numbers_width(view);
+
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
     let draw_last = text.line_to_byte(last_line) < text.len_bytes();
@@ -91,24 +126,41 @@ pub fn line_numbers<'doc>(
             } else {
                 line + 1
             };
+
+            let n_digits = count_digits(display_num);
+
             let style = if selected && is_focused {
                 linenr_select
             } else {
                 linenr
             };
-            write!(out, "{:>1$}", display_num, width).unwrap();
+
+            // if line number overflows maximum alotted width, truncate start
+            if n_digits > width {
+                let display_trailing = (display_num as u32) % 10_u32.pow((width - 1) as u32);
+                write!(out, "{}{:0>2$}", ELLIPSIS, display_trailing, width - 1).unwrap();
+            } else {
+                write!(out, "{:>1$}", display_num, width).unwrap();
+            }
+
             Some(style)
         }
     })
 }
 
+pub fn line_numbers_width(view: &View) -> usize {
+    // TODO: allow gutter widths to be dependent on Document. Currently the
+    // width is based on full View height, not visible line numbers.
+    let last_view_line = view.offset.row + view.area.bottom() as usize;
+    std::cmp::max(std::cmp::min(count_digits(last_view_line), 5), 3)
+}
+
 pub fn padding<'doc>(
     _editor: &'doc Editor,
     _doc: &'doc Document,
     _view: &View,
     _theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     Box::new(|_line: usize, _selected: bool, _out: &mut String| None)
 }
@@ -128,7 +180,6 @@ pub fn breakpoints<'doc>(
     _view: &View,
     theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     let warning = theme.get("warning");
     let error = theme.get("error");
@@ -181,10 +232,9 @@ pub fn diagnostics_or_breakpoints<'doc>(
     view: &View,
     theme: &Theme,
     is_focused: bool,
-    width: usize,
 ) -> GutterFn<'doc> {
-    let diagnostics = diagnostic(editor, doc, view, theme, is_focused, width);
-    let breakpoints = breakpoints(editor, doc, view, theme, is_focused, width);
+    let diagnostics = diagnostic(editor, doc, view, theme, is_focused);
+    let breakpoints = breakpoints(editor, doc, view, theme, is_focused);
 
     Box::new(move |line, selected, out| {
         breakpoints(line, selected, out).or_else(|| diagnostics(line, selected, out))
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 3df533dfc6d9..76215404f77c 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,8 +1,4 @@
-use crate::{
-    graphics::Rect,
-    gutter::{self, Gutter},
-    Document, DocumentId, ViewId,
-};
+use crate::{editor::GutterType, graphics::Rect, Document, DocumentId, ViewId};
 use helix_core::{pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection};
 
 use std::fmt;
@@ -82,9 +78,7 @@ pub struct View {
     pub object_selections: Vec<Selection>,
     /// Gutter (constructor) and width of gutter, used to calculate
     /// `gutter_offset`
-    gutters: Vec<(Gutter, usize)>,
-    /// cached total width of gutter
-    gutter_offset: u16,
+    gutters: Vec<GutterType>,
 }
 
 impl fmt::Debug for View {
@@ -99,28 +93,6 @@ impl fmt::Debug for View {
 
 impl View {
     pub fn new(doc: DocumentId, gutter_types: Vec<crate::editor::GutterType>) -> Self {
-        let mut gutters: Vec<(Gutter, usize)> = vec![];
-        let mut gutter_offset = 0;
-        use crate::editor::GutterType;
-        for gutter_type in &gutter_types {
-            let width = match gutter_type {
-                GutterType::Diagnostics => 1,
-                GutterType::LineNumbers => 5,
-                GutterType::Spacer => 1,
-            };
-            gutter_offset += width;
-            gutters.push((
-                match gutter_type {
-                    GutterType::Diagnostics => gutter::diagnostics_or_breakpoints,
-                    GutterType::LineNumbers => gutter::line_numbers,
-                    GutterType::Spacer => gutter::padding,
-                },
-                width as usize,
-            ));
-        }
-        if !gutter_types.is_empty() {
-            gutter_offset += 1;
-        }
         Self {
             id: ViewId::default(),
             doc,
@@ -130,8 +102,7 @@ impl View {
             docs_access_history: Vec::new(),
             last_modified_docs: [None, None],
             object_selections: Vec::new(),
-            gutters,
-            gutter_offset,
+            gutters: gutter_types,
         }
     }
 
@@ -144,13 +115,24 @@ impl View {
 
     pub fn inner_area(&self) -> Rect {
         // TODO add abilty to not use cached offset for runtime configurable gutter
-        self.area.clip_left(self.gutter_offset).clip_bottom(1) // -1 for statusline
+        self.area.clip_left(self.gutter_offset()).clip_bottom(1) // -1 for statusline
     }
 
-    pub fn gutters(&self) -> &[(Gutter, usize)] {
+    pub fn gutters(&self) -> &[GutterType] {
         &self.gutters
     }
 
+    pub fn gutter_offset(&self) -> u16 {
+        let mut offset = 0;
+        for gutter in self.gutters.iter() {
+            offset += gutter.width(self) as u16
+        }
+        if offset > 0 {
+            offset += 1
+        }
+        offset
+    }
+
     //
     pub fn offset_coords_to_in_view(
         &self,

From db95cc6359ab1ab7c38f3d8ab061c8f02cdc5309 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:57:19 -0700
Subject: [PATCH 02/13] removing digits lower-bound, permitting spacer

---
 helix-view/src/editor.rs | 1 +
 helix-view/src/gutter.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1e7f508c14bf..91c576bbe898 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -353,6 +353,7 @@ impl std::str::FromStr for GutterType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
             "diagnostics" => Ok(Self::Diagnostics),
+            "spacer" => Ok(Self::Spacer),
             "line-numbers" => Ok(Self::LineNumbers),
             _ => anyhow::bail!("Gutter type can only be `diagnostics` or `line-numbers`."),
         }
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 9a3a09eb1160..5e8421bc37de 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -152,7 +152,7 @@ pub fn line_numbers_width(view: &View) -> usize {
     // TODO: allow gutter widths to be dependent on Document. Currently the
     // width is based on full View height, not visible line numbers.
     let last_view_line = view.offset.row + view.area.bottom() as usize;
-    std::cmp::max(std::cmp::min(count_digits(last_view_line), 5), 3)
+    std::cmp::min(count_digits(last_view_line), 5)
 }
 
 pub fn padding<'doc>(

From c6269951c1020db722af8e623cde99cea1524fbd Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 17 Aug 2022 21:48:06 -0700
Subject: [PATCH 03/13] removing max line num char limit; adding notes;
 qualified successors; notes

---
 helix-view/src/gutter.rs | 17 ++++-------------
 helix-view/src/view.rs   |  4 +---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 5e8421bc37de..6c97f41b6508 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -1,5 +1,4 @@
 use std::fmt::Write;
-use std::iter::successors;
 
 use crate::{
     editor::GutterType,
@@ -8,7 +7,8 @@ use crate::{
 };
 
 fn count_digits(n: usize) -> usize {
-    successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
+    // NOTE: if int_log gets standardized in stdlib, can use checked_log10
+    std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
 }
 
 pub type GutterFn<'doc> = Box<dyn Fn(usize, bool, &mut String) -> Option<Style> + 'doc>;
@@ -89,8 +89,6 @@ pub fn line_numbers<'doc>(
     theme: &Theme,
     is_focused: bool,
 ) -> GutterFn<'doc> {
-    const ELLIPSIS: char = '\u{2026}';
-
     let text = doc.text().slice(..);
     let last_line = view.last_line(doc);
     let width = line_numbers_width(view);
@@ -127,8 +125,6 @@ pub fn line_numbers<'doc>(
                 line + 1
             };
 
-            let n_digits = count_digits(display_num);
-
             let style = if selected && is_focused {
                 linenr_select
             } else {
@@ -136,12 +132,7 @@ pub fn line_numbers<'doc>(
             };
 
             // if line number overflows maximum alotted width, truncate start
-            if n_digits > width {
-                let display_trailing = (display_num as u32) % 10_u32.pow((width - 1) as u32);
-                write!(out, "{}{:0>2$}", ELLIPSIS, display_trailing, width - 1).unwrap();
-            } else {
-                write!(out, "{:>1$}", display_num, width).unwrap();
-            }
+            write!(out, "{:>1$}", display_num, width).unwrap();
 
             Some(style)
         }
@@ -152,7 +143,7 @@ pub fn line_numbers_width(view: &View) -> usize {
     // TODO: allow gutter widths to be dependent on Document. Currently the
     // width is based on full View height, not visible line numbers.
     let last_view_line = view.offset.row + view.area.bottom() as usize;
-    std::cmp::min(count_digits(last_view_line), 5)
+    count_digits(last_view_line)
 }
 
 pub fn padding<'doc>(
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 76215404f77c..920e385b3e26 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -76,8 +76,7 @@ pub struct View {
     pub last_modified_docs: [Option<DocumentId>; 2],
     /// used to store previous selections of tree-sitter objects
     pub object_selections: Vec<Selection>,
-    /// Gutter (constructor) and width of gutter, used to calculate
-    /// `gutter_offset`
+    /// GutterTypes used to fetch Gutter (constructor) and width for rendering
     gutters: Vec<GutterType>,
 }
 
@@ -114,7 +113,6 @@ impl View {
     }
 
     pub fn inner_area(&self) -> Rect {
-        // TODO add abilty to not use cached offset for runtime configurable gutter
         self.area.clip_left(self.gutter_offset()).clip_bottom(1) // -1 for statusline
     }
 

From 969bba89e990b5b391f1a4e3b366ef6fd03599ea Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Thu, 18 Aug 2022 10:04:29 -0700
Subject: [PATCH 04/13] updating tests to use new line number width when
 testing views

---
 helix-view/src/view.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 920e385b3e26..41753beb3daa 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -320,7 +320,7 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
+    const OFFSET: u16 = 4; // 1 diagnostic + 2 linenr (based on view height digits "40") + 1 gutter
     const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
                                                 // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
     use crate::editor::GutterType;

From 44cbc64bb76ed17bf7f2529be570289b11e02307 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Tue, 23 Aug 2022 19:27:13 -0700
Subject: [PATCH 05/13] linenr width based on document line count

---
 helix-term/src/commands.rs  | 22 ++++-----
 helix-term/src/ui/editor.rs |  4 +-
 helix-view/src/editor.rs    |  4 +-
 helix-view/src/gutter.rs    | 13 +++---
 helix-view/src/lib.rs       |  2 +-
 helix-view/src/tree.rs      |  4 +-
 helix-view/src/view.rs      | 89 ++++++++++++++++++-------------------
 7 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 32f2800408af..0290e55b6277 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -864,7 +864,7 @@ fn goto_window(cx: &mut Context, align: Align) {
     let config = cx.editor.config();
     let (view, doc) = current!(cx.editor);
 
-    let height = view.inner_area().height as usize;
+    let height = view.inner_area(doc).height as usize;
 
     // respect user given count if any
     // - 1 so we have at least one gap in the middle.
@@ -1350,7 +1350,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
         return;
     }
 
-    let height = view.inner_area().height;
+    let height = view.inner_area(doc).height;
 
     let scrolloff = config.scrolloff.min(height as usize / 2);
 
@@ -1389,26 +1389,26 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 }
 
 fn page_up(cx: &mut Context) {
-    let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize;
+    let (view, doc) = current!(cx.editor);
+    let offset = view.inner_area(doc).height as usize;
     scroll(cx, offset, Direction::Backward);
 }
 
 fn page_down(cx: &mut Context) {
-    let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize;
+    let (view, doc) = current!(cx.editor);
+    let offset = view.inner_area(doc).height as usize;
     scroll(cx, offset, Direction::Forward);
 }
 
 fn half_page_up(cx: &mut Context) {
-    let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize / 2;
+    let (view, doc) = current!(cx.editor);
+    let offset = view.inner_area(doc).height as usize / 2;
     scroll(cx, offset, Direction::Backward);
 }
 
 fn half_page_down(cx: &mut Context) {
-    let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize / 2;
+    let (view, doc) = current!(cx.editor);
+    let offset = view.inner_area(doc).height as usize / 2;
     scroll(cx, offset, Direction::Forward);
 }
 
@@ -4214,7 +4214,7 @@ fn align_view_middle(cx: &mut Context) {
 
     view.offset.col = pos
         .col
-        .saturating_sub((view.inner_area().width as usize) / 2);
+        .saturating_sub((view.inner_area(doc).width as usize) / 2);
 }
 
 fn scroll_up(cx: &mut Context) {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2b68f1edb6e4..8d3b09c08bbc 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -76,7 +76,7 @@ impl EditorView {
         surface: &mut Surface,
         is_focused: bool,
     ) {
-        let inner = view.inner_area();
+        let inner = view.inner_area(doc);
         let area = view.area;
         let theme = &editor.theme;
 
@@ -640,7 +640,7 @@ impl EditorView {
 
         for gutter_type in view.gutters() {
             let gutter = gutter_type.row_styler(editor, doc, view, theme, is_focused);
-            let width = gutter_type.width(view);
+            let width = gutter_type.width(view, doc);
             text.reserve(width); // ensure there's enough space for the gutter
             for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
                 let selected = cursors.contains(&line);
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 91c576bbe898..75304dbf68b6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -814,7 +814,7 @@ impl Editor {
             .primary()
             .cursor(doc.text().slice(..));
         let line = doc.text().char_to_line(pos);
-        view.offset.row = line.saturating_sub(view.inner_area().height as usize / 2);
+        view.offset.row = line.saturating_sub(view.inner_area(doc).height as usize / 2);
     }
 
     pub fn switch(&mut self, id: DocumentId, action: Action) {
@@ -1131,7 +1131,7 @@ impl Editor {
             .primary()
             .cursor(doc.text().slice(..));
         if let Some(mut pos) = view.screen_coords_at_pos(doc, doc.text().slice(..), cursor) {
-            let inner = view.inner_area();
+            let inner = view.inner_area(doc);
             pos.col += inner.x as usize;
             pos.row += inner.y as usize;
             let cursorkind = config.cursor_shape.from_mode(doc.mode());
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 6c97f41b6508..a4e2a27f33e7 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -33,10 +33,10 @@ impl GutterType {
         }
     }
 
-    pub fn width(self, view: &View) -> usize {
+    pub fn width(self, view: &View, doc: &Document) -> usize {
         match self {
             GutterType::Diagnostics => 1,
-            GutterType::LineNumbers => line_numbers_width(view),
+            GutterType::LineNumbers => line_numbers_width(view, doc),
             GutterType::Spacer => 1,
         }
     }
@@ -91,7 +91,7 @@ pub fn line_numbers<'doc>(
 ) -> GutterFn<'doc> {
     let text = doc.text().slice(..);
     let last_line = view.last_line(doc);
-    let width = line_numbers_width(view);
+    let width = line_numbers_width(view, doc);
 
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
@@ -139,11 +139,8 @@ pub fn line_numbers<'doc>(
     })
 }
 
-pub fn line_numbers_width(view: &View) -> usize {
-    // TODO: allow gutter widths to be dependent on Document. Currently the
-    // width is based on full View height, not visible line numbers.
-    let last_view_line = view.offset.row + view.area.bottom() as usize;
-    count_digits(last_view_line)
+pub fn line_numbers_width(_view: &View, doc: &Document) -> usize {
+    count_digits(doc.text().len_lines() - 1)
 }
 
 pub fn padding<'doc>(
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 788304bce360..568673dae619 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -53,7 +53,7 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         .cursor(doc.text().slice(..));
     let line = doc.text().char_to_line(pos);
 
-    let height = view.inner_area().height as usize;
+    let height = view.inner_area(doc).height as usize;
 
     let relative = match align {
         Align::Center => height / 2,
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index c4474c33cf41..37c5a836d6a0 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -482,7 +482,7 @@ impl Tree {
                     // in a vertical container (and already correct based on previous search)
                     child_id = *container.children.iter().min_by_key(|id| {
                         let x = match &self.nodes[**id].content {
-                            Content::View(view) => view.inner_area().left(),
+                            Content::View(view) => view.area.left(),
                             Content::Container(container) => container.area.left(),
                         };
                         (current_x as i16 - x as i16).abs()
@@ -493,7 +493,7 @@ impl Tree {
                     // in a horizontal container (and already correct based on previous search)
                     child_id = *container.children.iter().min_by_key(|id| {
                         let y = match &self.nodes[**id].content {
-                            Content::View(view) => view.inner_area().top(),
+                            Content::View(view) => view.area.top(),
                             Content::Container(container) => container.area.top(),
                         };
                         (current_y as i16 - y as i16).abs()
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 41753beb3daa..3743c521eb42 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -112,18 +112,18 @@ impl View {
         self.docs_access_history.push(id);
     }
 
-    pub fn inner_area(&self) -> Rect {
-        self.area.clip_left(self.gutter_offset()).clip_bottom(1) // -1 for statusline
+    pub fn inner_area(&self, doc: &Document) -> Rect {
+        self.area.clip_left(self.gutter_offset(doc)).clip_bottom(1) // -1 for statusline
     }
 
     pub fn gutters(&self) -> &[GutterType] {
         &self.gutters
     }
 
-    pub fn gutter_offset(&self) -> u16 {
+    pub fn gutter_offset(&self, doc: &Document) -> u16 {
         let mut offset = 0;
         for gutter in self.gutters.iter() {
-            offset += gutter.width(self) as u16
+            offset += gutter.width(self, doc) as u16
         }
         if offset > 0 {
             offset += 1
@@ -145,7 +145,7 @@ impl View {
         let Position { col, row: line } =
             visual_coords_at_pos(doc.text().slice(..), cursor, doc.tab_width());
 
-        let inner_area = self.inner_area();
+        let inner_area = self.inner_area(doc);
         let last_line = (self.offset.row + inner_area.height as usize).saturating_sub(1);
 
         // - 1 so we have at least one gap in the middle.
@@ -195,7 +195,7 @@ impl View {
     /// Calculates the last visible line on screen
     #[inline]
     pub fn last_line(&self, doc: &Document) -> usize {
-        let height = self.inner_area().height;
+        let height = self.inner_area(doc).height;
         std::cmp::min(
             // Saturating subs to make it inclusive zero indexing.
             (self.offset.row + height as usize).saturating_sub(1),
@@ -232,12 +232,13 @@ impl View {
 
     pub fn text_pos_at_screen_coords(
         &self,
-        text: &RopeSlice,
+        doc: &Document,
         row: u16,
         column: u16,
         tab_width: usize,
     ) -> Option<usize> {
-        let inner = self.inner_area();
+        let text = doc.text().slice(..);
+        let inner = self.inner_area(doc);
         // 1 for status
         if row < inner.top() || row >= inner.bottom() {
             return None;
@@ -255,7 +256,7 @@ impl View {
         let text_col = (column - inner.x) as usize + self.offset.col;
 
         Some(pos_at_visual_coords(
-            *text,
+            text,
             Position {
                 row: text_row,
                 col: text_col,
@@ -267,7 +268,7 @@ impl View {
     /// Translates a screen position to position in the text document.
     /// Returns a usize typed position in bounds of the text if found in this view, None if out of view.
     pub fn pos_at_screen_coords(&self, doc: &Document, row: u16, column: u16) -> Option<usize> {
-        self.text_pos_at_screen_coords(&doc.text().slice(..), row, column, doc.tab_width())
+        self.text_pos_at_screen_coords(doc, row, column, doc.tab_width())
     }
 
     /// Translates screen coordinates into coordinates on the gutter of the view.
@@ -320,9 +321,10 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 4; // 1 diagnostic + 2 linenr (based on view height digits "40") + 1 gutter
+    const OFFSET: u16 = 3; // 1 diagnostic + 1 linenr (< 10 lines) + 1 gutter
     const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
                                                 // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
+    use crate::document::Document;
     use crate::editor::GutterType;
 
     #[test]
@@ -333,45 +335,45 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 2, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 2, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 41, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 2, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 2, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 49, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 49, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 41, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 81, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 81, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 78, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 78, 41, 4), None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
             Some(3)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 80, 4), Some(3));
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 80, 4), Some(3));
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 1, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 4, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 7, 4),
             Some(8)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 41, 80, 4), Some(8));
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 80, 4), Some(8));
     }
 
     #[test]
@@ -379,9 +381,9 @@ mod tests {
         let mut view = View::new(DocumentId::default(), vec![GutterType::Diagnostics]);
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
             Some(4)
         );
     }
@@ -391,11 +393,8 @@ mod tests {
         let mut view = View::new(DocumentId::default(), vec![]);
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
-        assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + 1, 4),
-            Some(4)
-        );
+        let doc = Document::from(rope, None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 40 + 1, 4), Some(4));
     }
 
     #[test]
@@ -406,34 +405,34 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hi! こんにちは皆さん");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
             Some(4)
         );
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 5, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 5, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 6, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 6, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 7, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 8, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 8, 4),
             Some(6)
         );
     }
@@ -446,30 +445,30 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hèl̀l̀ò world!");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 1, 4),
             Some(1)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 2, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 2, 4),
             Some(3)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
             Some(7)
         );
     }

From 603913d05a302c8c22b310d1702d64053e440d07 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 24 Aug 2022 09:42:29 -0700
Subject: [PATCH 06/13] using min width of 2 so line numbers relative is useful

---
 helix-view/src/gutter.rs | 18 +++++++++++-------
 helix-view/src/view.rs   |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index a4e2a27f33e7..43cc6b250675 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -33,10 +33,10 @@ impl GutterType {
         }
     }
 
-    pub fn width(self, view: &View, doc: &Document) -> usize {
+    pub fn width(self, _view: &View, doc: &Document) -> usize {
         match self {
             GutterType::Diagnostics => 1,
-            GutterType::LineNumbers => line_numbers_width(view, doc),
+            GutterType::LineNumbers => line_numbers_width(_view, doc),
             GutterType::Spacer => 1,
         }
     }
@@ -91,7 +91,7 @@ pub fn line_numbers<'doc>(
 ) -> GutterFn<'doc> {
     let text = doc.text().slice(..);
     let last_line = view.last_line(doc);
-    let width = line_numbers_width(view, doc);
+    let width = GutterType::LineNumbers.width(view, doc);
 
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
@@ -131,16 +131,20 @@ pub fn line_numbers<'doc>(
                 linenr
             };
 
-            // if line number overflows maximum alotted width, truncate start
             write!(out, "{:>1$}", display_num, width).unwrap();
-
             Some(style)
         }
     })
 }
 
-pub fn line_numbers_width(_view: &View, doc: &Document) -> usize {
-    count_digits(doc.text().len_lines() - 1)
+pub fn line_numbers_width<'doc>(_view: &View, doc: &'doc Document) -> usize {
+    let text = doc.text();
+    let last_line = text.len_lines().saturating_sub(1);
+    let draw_last = text.line_to_byte(last_line) < text.len_bytes();
+    let last_drawn = if draw_last { last_line + 1 } else { last_line };
+
+    // set a lower bound to 2-chars to minimize ambiguous relative line numbers
+    std::cmp::max(count_digits(last_drawn), 2)
 }
 
 pub fn padding<'doc>(
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 3743c521eb42..9bdea946d8cc 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -321,7 +321,7 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 3; // 1 diagnostic + 1 linenr (< 10 lines) + 1 gutter
+    const OFFSET: u16 = 4; // 1 diagnostic + 2 linenr (< 100 lines) + 1 gutter
     const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
                                                 // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
     use crate::document::Document;

From 4015e38ff36a92644ee045b6497465844bb4d5ae Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 24 Aug 2022 10:12:15 -0700
Subject: [PATCH 07/13] lint rolling; removing unnecessary type parameter
 lifetime

---
 helix-view/src/gutter.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 43cc6b250675..e00be38e49e1 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -137,7 +137,7 @@ pub fn line_numbers<'doc>(
     })
 }
 
-pub fn line_numbers_width<'doc>(_view: &View, doc: &'doc Document) -> usize {
+pub fn line_numbers_width(_view: &View, doc: &Document) -> usize {
     let text = doc.text();
     let last_line = text.len_lines().saturating_sub(1);
     let draw_last = text.line_to_byte(last_line) < text.len_bytes();

From 57a9d56f0d9a6f19cb51b32782b1e7b989da6d2d Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Fri, 28 Oct 2022 16:12:21 -0400
Subject: [PATCH 08/13] merge change resolution

---
 helix-term/src/ui/editor.rs | 2 +-
 helix-view/src/lib.rs       | 2 +-
 helix-view/src/view.rs      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2e598d5d1fec..dd7ee11b8c38 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -883,7 +883,7 @@ impl EditorView {
             .or_else(|| theme.try_get_exact("ui.cursorcolumn"))
             .unwrap_or_else(|| theme.get("ui.cursorline.secondary"));
 
-        let inner_area = view.inner_area();
+        let inner_area = view.inner_area(doc);
         let offset = view.offset.col;
 
         let selection = doc.selection(view.id);
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 276be44186a7..3d9461c24019 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -53,7 +53,7 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         .cursor(doc.text().slice(..));
     let line = doc.text().char_to_line(pos);
 
-    let last_line_height = view.inner_area().height.saturating_sub(1) as usize;
+    let last_line_height = view.inner_area(doc).height.saturating_sub(1) as usize;
 
     let relative = match align {
         Align::Center => last_line_height / 2,
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index f01ca900b114..45919fdb3e20 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,7 +1,6 @@
 use crate::{
     editor::GutterType,
     graphics::Rect,
-    gutter::{self, Gutter},
     Document, DocumentId, ViewId,
 };
 use helix_core::{

From 82ce1915da872a477a080376e04a166fef821649 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Fri, 28 Oct 2022 16:20:26 -0400
Subject: [PATCH 09/13] reformat code

---
 helix-view/src/view.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 45919fdb3e20..73a3e1c0b610 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,8 +1,4 @@
-use crate::{
-    editor::GutterType,
-    graphics::Rect,
-    Document, DocumentId, ViewId,
-};
+use crate::{editor::GutterType, graphics::Rect, Document, DocumentId, ViewId};
 use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };

From 867488845f6177b3f20a8a29226ba91fa57a751f Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Sun, 30 Oct 2022 08:52:09 -0400
Subject: [PATCH 10/13] rename row_styler to style; add int_log resource

---
 helix-term/src/ui/editor.rs | 2 +-
 helix-view/src/gutter.rs    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index dd7ee11b8c38..b1723ae6c34a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -737,7 +737,7 @@ impl EditorView {
         let mut text = String::with_capacity(8);
 
         for gutter_type in view.gutters() {
-            let gutter = gutter_type.row_styler(editor, doc, view, theme, is_focused);
+            let gutter = gutter_type.style(editor, doc, view, theme, is_focused);
             let width = gutter_type.width(view, doc);
             text.reserve(width); // ensure there's enough space for the gutter
             for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 27fdfcd97bf6..61a1779186c3 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -8,6 +8,7 @@ use crate::{
 
 fn count_digits(n: usize) -> usize {
     // NOTE: if int_log gets standardized in stdlib, can use checked_log10
+    // (https://github.com/rust-lang/rust/issues/70887#issue)
     std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
 }
 
@@ -16,7 +17,7 @@ pub type Gutter =
     for<'doc> fn(&'doc Editor, &'doc Document, &View, &Theme, bool, usize) -> GutterFn<'doc>;
 
 impl GutterType {
-    pub fn row_styler<'doc>(
+    pub fn style<'doc>(
         self,
         editor: &'doc Editor,
         doc: &'doc Document,

From fd1bf4791b21e49e494029b9660e01bac5ec76f5 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Tue, 1 Nov 2022 21:31:16 -0400
Subject: [PATCH 11/13] adding spacer to gutters default; updating book config
 entry

---
 book/src/configuration.md | 2 +-
 helix-view/src/editor.rs  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 9f3fe2fa95bd..20abeba5a216 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -46,7 +46,7 @@ on unix operating systems.
 | `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
 | `cursorline` | Highlight all lines with a cursor. | `false` |
 | `cursorcolumn` | Highlight all columns with a cursor. | `false` |
-| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers"]` |
+| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers"]` |
 | `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
 | `auto-format` | Enable automatic formatting on save. | `true` |
 | `auto-save` | Enable automatic saving on focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal. | `false` |
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index af36347acfa5..681dbad345fb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -590,7 +590,11 @@ impl Default for Config {
             line_number: LineNumber::Absolute,
             cursorline: false,
             cursorcolumn: false,
-            gutters: vec![GutterType::Diagnostics, GutterType::LineNumbers],
+            gutters: vec![
+                GutterType::Diagnostics,
+                GutterType::Spacer,
+                GutterType::LineNumbers,
+            ],
             middle_click_paste: true,
             auto_pairs: AutoPairConfig::default(),
             auto_completion: true,

From f9152bacbdcef925f4ebe81b08a29c4e004a41a9 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Fri, 4 Nov 2022 16:26:09 -0400
Subject: [PATCH 12/13] adding view.inner_height(), swap for loop for iterator

---
 helix-term/src/commands.rs | 22 +++++++++++-----------
 helix-view/src/lib.rs      |  2 +-
 helix-view/src/view.rs     | 18 ++++++++++++------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d1d4ffac57a5..d2515c5f8ca0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -870,7 +870,7 @@ fn goto_window(cx: &mut Context, align: Align) {
     let config = cx.editor.config();
     let (view, doc) = current!(cx.editor);
 
-    let height = view.inner_area(doc).height as usize;
+    let height = view.inner_height();
 
     // respect user given count if any
     // - 1 so we have at least one gap in the middle.
@@ -1360,9 +1360,9 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
         return;
     }
 
-    let height = view.inner_area(doc).height;
+    let height = view.inner_height();
 
-    let scrolloff = config.scrolloff.min(height as usize / 2);
+    let scrolloff = config.scrolloff.min(height / 2);
 
     view.offset.row = match direction {
         Forward => view.offset.row + offset,
@@ -1399,26 +1399,26 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 }
 
 fn page_up(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
-    let offset = view.inner_area(doc).height as usize;
+    let (view, _doc) = current!(cx.editor);
+    let offset = view.inner_height();
     scroll(cx, offset, Direction::Backward);
 }
 
 fn page_down(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
-    let offset = view.inner_area(doc).height as usize;
+    let (view, _doc) = current!(cx.editor);
+    let offset = view.inner_height();
     scroll(cx, offset, Direction::Forward);
 }
 
 fn half_page_up(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
-    let offset = view.inner_area(doc).height as usize / 2;
+    let (view, _doc) = current!(cx.editor);
+    let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Backward);
 }
 
 fn half_page_down(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
-    let offset = view.inner_area(doc).height as usize / 2;
+    let (view, _doc) = current!(cx.editor);
+    let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Forward);
 }
 
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 3d9461c24019..c25357653264 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -53,7 +53,7 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         .cursor(doc.text().slice(..));
     let line = doc.text().char_to_line(pos);
 
-    let last_line_height = view.inner_area(doc).height.saturating_sub(1) as usize;
+    let last_line_height = view.inner_height().saturating_sub(1);
 
     let relative = match align {
         Align::Center => last_line_height / 2,
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 73a3e1c0b610..6da4df1f0f03 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -134,18 +134,25 @@ impl View {
         self.area.clip_left(self.gutter_offset(doc)).clip_bottom(1) // -1 for statusline
     }
 
+    pub fn inner_height(&self) -> usize {
+        self.area.clip_bottom(1).height.into() // -1 for statusline
+    }
+
     pub fn gutters(&self) -> &[GutterType] {
         &self.gutters
     }
 
     pub fn gutter_offset(&self, doc: &Document) -> u16 {
-        let mut offset = 0;
-        for gutter in self.gutters.iter() {
-            offset += gutter.width(self, doc) as u16
-        }
+        let mut offset = self
+            .gutters
+            .iter()
+            .map(|gutter| gutter.width(self, doc) as u16)
+            .sum();
+
         if offset > 0 {
             offset += 1
         }
+
         offset
     }
 
@@ -213,10 +220,9 @@ impl View {
     /// Calculates the last visible line on screen
     #[inline]
     pub fn last_line(&self, doc: &Document) -> usize {
-        let height = self.inner_area(doc).height;
         std::cmp::min(
             // Saturating subs to make it inclusive zero indexing.
-            (self.offset.row + height as usize).saturating_sub(1),
+            (self.offset.row + self.inner_height()).saturating_sub(1),
             doc.text().len_lines().saturating_sub(1),
         )
     }

From 07832d79b46dc2ab268995afec2d55ae1cc6a437 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Fri, 4 Nov 2022 22:48:15 -0400
Subject: [PATCH 13/13] reverting change of current! to view! now that doc is
 not needed

---
 helix-term/src/commands.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d2515c5f8ca0..8f7064472eae 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1399,25 +1399,25 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 }
 
 fn page_up(cx: &mut Context) {
-    let (view, _doc) = current!(cx.editor);
+    let view = view!(cx.editor);
     let offset = view.inner_height();
     scroll(cx, offset, Direction::Backward);
 }
 
 fn page_down(cx: &mut Context) {
-    let (view, _doc) = current!(cx.editor);
+    let view = view!(cx.editor);
     let offset = view.inner_height();
     scroll(cx, offset, Direction::Forward);
 }
 
 fn half_page_up(cx: &mut Context) {
-    let (view, _doc) = current!(cx.editor);
+    let view = view!(cx.editor);
     let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Backward);
 }
 
 fn half_page_down(cx: &mut Context) {
-    let (view, _doc) = current!(cx.editor);
+    let view = view!(cx.editor);
     let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Forward);
 }