From 038201647c657b2b07fa7f87aae3c609c59c77ef Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 4 Oct 2020 23:47:37 +0200
Subject: started work on goto mode

---
 helix-view/src/commands.rs | 22 ++++++++++++++++++++++
 helix-view/src/keymap.rs   |  9 +++++++++
 2 files changed, 31 insertions(+)

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 6dd1101c..eb9aaf6f 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -117,6 +117,24 @@ pub fn move_next_word_end(view: &mut View, count: usize) {
     view.state.selection = Selection::single(pos, pos);
 }
 
+pub fn move_file_start(view: &mut View, count: usize) {
+    // TODO: use a transaction
+    view.state.selection = view
+        .state
+        .move_selection(Direction::Backward, Granularity::Line, count);
+
+    view.state.mode = Mode::Normal;
+}
+
+pub fn move_file_end(view: &mut View, count: usize) {
+    // TODO: use a transaction
+    view.state.selection = view
+        .state
+        .move_selection(Direction::Forward, Granularity::Line, count);
+
+    view.state.mode = Mode::Normal;
+}
+
 // avoid select by default by having a visual mode switch that makes movements into selects
 
 pub fn extend_char_left(view: &mut View, count: usize) {
@@ -292,6 +310,10 @@ pub fn normal_mode(view: &mut View, _count: usize) {
     }
 }
 
+pub fn goto_mode(view: &mut View, _count: usize) {
+    view.state.mode = Mode::Goto;
+}
+
 // TODO: insert means add text just before cursor, on exit we should be on the last letter.
 pub fn insert_char(view: &mut View, c: char) {
     let c = Tendril::from_char(c);
diff --git a/helix-view/src/keymap.rs b/helix-view/src/keymap.rs
index ef23ff2a..c93c3c1f 100644
--- a/helix-view/src/keymap.rs
+++ b/helix-view/src/keymap.rs
@@ -126,6 +126,7 @@ pub fn default() -> Keymaps {
                 vec![key!('w')] => commands::move_next_word_start,
                 vec![key!('b')] => commands::move_prev_word_start,
                 vec![key!('e')] => commands::move_next_word_end,
+                vec![key!('g')] => commands::goto_mode,
                 vec![key!('i')] => commands::insert_mode,
                 vec![shift!('I')] => commands::prepend_to_line,
                 vec![key!('a')] => commands::append_mode,
@@ -161,6 +162,14 @@ pub fn default() -> Keymaps {
                     code: KeyCode::Tab,
                     modifiers: Modifiers::NONE
                 }] => commands::insert_tab,
+            ),
+            state::Mode::Goto => hashmap!(
+                vec![Key {
+                    code: KeyCode::Esc,
+                    modifiers: Modifiers::NONE
+                }] => commands::normal_mode as Command,
+                vec![key!('g')] => commands::move_file_start as Command,
+                vec![key!('e')] => commands::move_file_end as Command,
             )
     )
 }
-- 
cgit v1.2.3-70-g09d2


From b7ef7985ee0b163e2e9c352a98886d46429379c4 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Mon, 5 Oct 2020 15:37:33 +0200
Subject: added gg command

---
 helix-view/src/commands.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index eb9aaf6f..63084520 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -117,20 +117,18 @@ pub fn move_next_word_end(view: &mut View, count: usize) {
     view.state.selection = Selection::single(pos, pos);
 }
 
-pub fn move_file_start(view: &mut View, count: usize) {
+pub fn move_file_start(view: &mut View, _count: usize) {
     // TODO: use a transaction
-    view.state.selection = view
-        .state
-        .move_selection(Direction::Backward, Granularity::Line, count);
+    view.state.selection = Selection::single(0, 0);
 
     view.state.mode = Mode::Normal;
 }
 
-pub fn move_file_end(view: &mut View, count: usize) {
+pub fn move_file_end(view: &mut View, _count: usize) {
     // TODO: use a transaction
-    view.state.selection = view
-        .state
-        .move_selection(Direction::Forward, Granularity::Line, count);
+    let text = &view.state.doc;
+    let last_line = text.char_to_line(text.len_lines().checked_sub(1).unwrap());
+    view.state.selection = Selection::single(last_line, last_line);
 
     view.state.mode = Mode::Normal;
 }
-- 
cgit v1.2.3-70-g09d2


From 7ccc4993f4814f72106de4882d00614fdc67ba13 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Mon, 5 Oct 2020 15:47:15 +0200
Subject: added ge command

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

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 63084520..43c27cb4 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -127,7 +127,7 @@ pub fn move_file_start(view: &mut View, _count: usize) {
 pub fn move_file_end(view: &mut View, _count: usize) {
     // TODO: use a transaction
     let text = &view.state.doc;
-    let last_line = text.char_to_line(text.len_lines().checked_sub(1).unwrap());
+    let last_line = text.line_to_char(text.len_lines().checked_sub(1).unwrap());
     view.state.selection = Selection::single(last_line, last_line);
 
     view.state.mode = Mode::Normal;
-- 
cgit v1.2.3-70-g09d2


From 1035b2aea170b68c7f0ed62fa0414e0ed48d5792 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Mon, 5 Oct 2020 17:18:29 +0200
Subject: started work on page up/down

---
 helix-view/src/commands.rs | 19 ++++++++++++++++++-
 helix-view/src/keymap.rs   | 10 ++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 43c27cb4..1d8d851e 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -127,12 +127,29 @@ pub fn move_file_start(view: &mut View, _count: usize) {
 pub fn move_file_end(view: &mut View, _count: usize) {
     // TODO: use a transaction
     let text = &view.state.doc;
-    let last_line = text.line_to_char(text.len_lines().checked_sub(1).unwrap());
+    let last_line = text.line_to_char(text.len_lines().checked_sub(2).unwrap());
     view.state.selection = Selection::single(last_line, last_line);
 
     view.state.mode = Mode::Normal;
 }
 
+pub fn page_up(view: &mut View, _count: usize) {
+    view.first_line = view.first_line.saturating_sub(view.size.1);
+    view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
+}
+
+pub fn page_down(view: &mut View, _count: usize) {
+    view.first_line += view.size.1;
+    view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
+}
+
+pub fn half_page_up(view: &mut View, _count: usize) {
+    view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
+}
+
+pub fn half_page_down(view: &mut View, _count: usize) {
+    view.first_line += view.size.1 / 2;
+}
 // avoid select by default by having a visual mode switch that makes movements into selects
 
 pub fn extend_char_left(view: &mut View, count: usize) {
diff --git a/helix-view/src/keymap.rs b/helix-view/src/keymap.rs
index c93c3c1f..27176423 100644
--- a/helix-view/src/keymap.rs
+++ b/helix-view/src/keymap.rs
@@ -140,6 +140,16 @@ pub fn default() -> Keymaps {
                     code: KeyCode::Esc,
                     modifiers: Modifiers::NONE
                 }] => commands::normal_mode,
+                vec![Key {
+                    code: KeyCode::PageUp,
+                    modifiers: Modifiers::NONE
+                }] => commands::page_up,
+                vec![Key {
+                    code: KeyCode::PageDown,
+                    modifiers: Modifiers::NONE
+                }] => commands::page_down,
+                vec![shift!('u')] => commands::half_page_up,
+                vec![shift!('d')] => commands::half_page_down,
             ),
             state::Mode::Insert => hashmap!(
                 vec![Key {
-- 
cgit v1.2.3-70-g09d2


From 88f93399fd4a451f529693269e4154421c8a6d06 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Mon, 5 Oct 2020 17:58:16 +0200
Subject: fixed page up/down

---
 helix-view/src/commands.rs | 42 ++++++++++++++++++++++++++++++++++++++++--
 helix-view/src/keymap.rs   | 13 +++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 1d8d851e..0b985dc6 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -133,22 +133,60 @@ pub fn move_file_end(view: &mut View, _count: usize) {
     view.state.mode = Mode::Normal;
 }
 
+pub fn check_cursor_in_view(view: &mut View) -> bool {
+    let cursor = view.state.selection().cursor();
+    let line = view.state.doc().char_to_line(cursor) as u16;
+    let document_end = view.first_line + view.size.1.saturating_sub(1) - 1;
+    let padding = 5u16;
+
+    if (line > document_end.saturating_sub(padding)) | (line < view.first_line + padding) {
+        return false;
+    }
+    true
+}
+
 pub fn page_up(view: &mut View, _count: usize) {
+    let text = &view.state.doc;
     view.first_line = view.first_line.saturating_sub(view.size.1);
-    view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
+
+    view.state.selection = Selection::single(
+        text.line_to_char(view.first_line as usize),
+        text.line_to_char(view.first_line as usize),
+    );
 }
 
 pub fn page_down(view: &mut View, _count: usize) {
+    let text = &view.state.doc;
     view.first_line += view.size.1;
-    view.state.selection = Selection::single(view.first_line as usize, view.first_line as usize);
+
+    view.state.selection = Selection::single(
+        text.line_to_char(view.first_line as usize),
+        text.line_to_char(view.first_line as usize),
+    );
 }
 
 pub fn half_page_up(view: &mut View, _count: usize) {
     view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
+
+    if !check_cursor_in_view(view) {
+        let text = &view.state.doc;
+        view.state.selection = Selection::single(
+            text.line_to_char(view.first_line as usize),
+            text.line_to_char(view.first_line as usize),
+        );
+    }
 }
 
 pub fn half_page_down(view: &mut View, _count: usize) {
     view.first_line += view.size.1 / 2;
+
+    if !check_cursor_in_view(view) {
+        let text = &view.state.doc;
+        view.state.selection = Selection::single(
+            text.line_to_char(view.first_line as usize),
+            text.line_to_char(view.first_line as usize),
+        );
+    }
 }
 // avoid select by default by having a visual mode switch that makes movements into selects
 
diff --git a/helix-view/src/keymap.rs b/helix-view/src/keymap.rs
index 27176423..72fc0e79 100644
--- a/helix-view/src/keymap.rs
+++ b/helix-view/src/keymap.rs
@@ -108,6 +108,15 @@ macro_rules! shift {
     };
 }
 
+macro_rules! ctrl {
+    ($ch:expr) => {
+        Key {
+            code: KeyCode::Char($ch),
+            modifiers: Modifiers::CONTROL,
+        }
+    };
+}
+
 pub fn default() -> Keymaps {
     hashmap!(
         state::Mode::Normal =>
@@ -148,8 +157,8 @@ pub fn default() -> Keymaps {
                     code: KeyCode::PageDown,
                     modifiers: Modifiers::NONE
                 }] => commands::page_down,
-                vec![shift!('u')] => commands::half_page_up,
-                vec![shift!('d')] => commands::half_page_down,
+                vec![ctrl!('u')] => commands::half_page_up,
+                vec![ctrl!('d')] => commands::half_page_down,
             ),
             state::Mode::Insert => hashmap!(
                 vec![Key {
-- 
cgit v1.2.3-70-g09d2


From 750610f0e7e2d27604983ffdcd8d6a447bc898b2 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Wed, 7 Oct 2020 01:41:09 +0200
Subject: various fixes

---
 helix-term/src/editor.rs   |  4 ++--
 helix-view/src/commands.rs | 41 ++++++++++++++++++-----------------------
 helix-view/src/view.rs     | 14 +++++---------
 3 files changed, 25 insertions(+), 34 deletions(-)

(limited to 'helix-view')

diff --git a/helix-term/src/editor.rs b/helix-term/src/editor.rs
index 266c0198..acb742b2 100644
--- a/helix-term/src/editor.rs
+++ b/helix-term/src/editor.rs
@@ -87,7 +87,7 @@ impl Editor {
                 // TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
                 let source_code = view.state.doc().to_string();
 
-                let last_line = view.last_line(viewport);
+                let last_line = view.last_line();
 
                 let range = {
                     // calculate viewport byte ranges
@@ -286,7 +286,7 @@ impl Editor {
                 let pos = view.state.selection().cursor();
 
                 let pos = view
-                    .screen_coords_at_pos(&view.state.doc().slice(..), pos, area)
+                    .screen_coords_at_pos(&view.state.doc().slice(..), pos)
                     .expect("Cursor is out of bounds.");
 
                 execute!(
diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 0b985dc6..b2223d48 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -13,6 +13,8 @@ use crate::view::View;
 /// state (usually by creating and applying a transaction).
 pub type Command = fn(view: &mut View, count: usize);
 
+const PADDING: u16 = 10;
+
 pub fn move_char_left(view: &mut View, count: usize) {
     // TODO: use a transaction
     let selection = view
@@ -127,7 +129,7 @@ pub fn move_file_start(view: &mut View, _count: usize) {
 pub fn move_file_end(view: &mut View, _count: usize) {
     // TODO: use a transaction
     let text = &view.state.doc;
-    let last_line = text.line_to_char(text.len_lines().checked_sub(2).unwrap());
+    let last_line = text.line_to_char(text.len_lines().saturating_sub(2));
     view.state.selection = Selection::single(last_line, last_line);
 
     view.state.mode = Mode::Normal;
@@ -136,7 +138,7 @@ pub fn move_file_end(view: &mut View, _count: usize) {
 pub fn check_cursor_in_view(view: &mut View) -> bool {
     let cursor = view.state.selection().cursor();
     let line = view.state.doc().char_to_line(cursor) as u16;
-    let document_end = view.first_line + view.size.1.saturating_sub(1) - 1;
+    let document_end = view.first_line + view.size.1.saturating_sub(2);
     let padding = 5u16;
 
     if (line > document_end.saturating_sub(padding)) | (line < view.first_line + padding) {
@@ -148,44 +150,37 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
 pub fn page_up(view: &mut View, _count: usize) {
     let text = &view.state.doc;
     view.first_line = view.first_line.saturating_sub(view.size.1);
+    let pos = text.line_to_char(view.first_line as usize);
 
-    view.state.selection = Selection::single(
-        text.line_to_char(view.first_line as usize),
-        text.line_to_char(view.first_line as usize),
-    );
+    view.state.selection = Selection::single(pos, pos);
 }
 
 pub fn page_down(view: &mut View, _count: usize) {
     let text = &view.state.doc;
-    view.first_line += view.size.1;
-
-    view.state.selection = Selection::single(
-        text.line_to_char(view.first_line as usize),
-        text.line_to_char(view.first_line as usize),
-    );
+    view.first_line += view.size.1 + PADDING;
+    if view.first_line < view.state.doc().len_lines() as u16 {
+        let pos = text.line_to_char(view.first_line as usize);
+        view.state.selection = Selection::single(pos, pos);
+    }
 }
 
 pub fn half_page_up(view: &mut View, _count: usize) {
     view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
-
     if !check_cursor_in_view(view) {
         let text = &view.state.doc;
-        view.state.selection = Selection::single(
-            text.line_to_char(view.first_line as usize),
-            text.line_to_char(view.first_line as usize),
-        );
+        let pos = text.line_to_char(view.first_line as usize);
+        view.state.selection = Selection::single(pos, pos);
     }
 }
 
 pub fn half_page_down(view: &mut View, _count: usize) {
-    view.first_line += view.size.1 / 2;
-
+    if view.first_line < view.state.doc().len_lines() as u16 - view.size.1 {
+        view.first_line += view.size.1 / 2;
+    }
     if !check_cursor_in_view(view) {
         let text = &view.state.doc;
-        view.state.selection = Selection::single(
-            text.line_to_char(view.first_line as usize),
-            text.line_to_char(view.first_line as usize),
-        );
+        let pos = text.line_to_char(view.first_line as usize);
+        view.state.selection = Selection::single(pos, pos);
     }
 }
 // avoid select by default by having a visual mode switch that makes movements into selects
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 09cd4c65..0e6705f0 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -34,7 +34,7 @@ impl View {
     pub fn ensure_cursor_in_view(&mut self) {
         let cursor = self.state.selection().cursor();
         let line = self.state.doc().char_to_line(cursor) as u16;
-        let document_end = self.first_line + self.size.1.saturating_sub(1) - 1;
+        let document_end = self.first_line + self.size.1.saturating_sub(2);
 
         let padding = 5u16;
 
@@ -51,7 +51,8 @@ impl View {
 
     /// Calculates the last visible line on screen
     #[inline]
-    pub fn last_line(&self, viewport: Rect) -> usize {
+    pub fn last_line(&self) -> usize {
+        let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
         std::cmp::min(
             (self.first_line + viewport.height) as usize,
             self.state.doc().len_lines() - 1,
@@ -61,15 +62,10 @@ impl View {
     /// Translates a document position to an absolute position in the terminal.
     /// Returns a (line, col) position if the position is visible on screen.
     // TODO: Could return width as well for the character width at cursor.
-    pub fn screen_coords_at_pos(
-        &self,
-        text: &RopeSlice,
-        pos: usize,
-        viewport: Rect,
-    ) -> Option<Position> {
+    pub fn screen_coords_at_pos(&self, text: &RopeSlice, pos: usize) -> Option<Position> {
         let line = text.char_to_line(pos);
 
-        if line < self.first_line as usize || line > self.last_line(viewport) {
+        if line < self.first_line as usize || line > self.last_line() {
             // Line is not visible on screen
             return None;
         }
-- 
cgit v1.2.3-70-g09d2


From 61ef0a4e87cf6b3a9c64c7d003f373d53fe61818 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Wed, 7 Oct 2020 13:58:13 +0900
Subject: Fix scrolling calculations.

---
 helix-view/src/commands.rs | 20 ++++++++++++--------
 helix-view/src/view.rs     |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'helix-view')

diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index b2223d48..9ebdb4c4 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -13,7 +13,7 @@ use crate::view::View;
 /// state (usually by creating and applying a transaction).
 pub type Command = fn(view: &mut View, count: usize);
 
-const PADDING: u16 = 10;
+const PADDING: u16 = 5;
 
 pub fn move_char_left(view: &mut View, count: usize) {
     // TODO: use a transaction
@@ -138,10 +138,9 @@ pub fn move_file_end(view: &mut View, _count: usize) {
 pub fn check_cursor_in_view(view: &mut View) -> bool {
     let cursor = view.state.selection().cursor();
     let line = view.state.doc().char_to_line(cursor) as u16;
-    let document_end = view.first_line + view.size.1.saturating_sub(2);
-    let padding = 5u16;
+    let document_end = view.first_line + view.size.1.saturating_sub(1);
 
-    if (line > document_end.saturating_sub(padding)) | (line < view.first_line + padding) {
+    if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
         return false;
     }
     true
@@ -150,9 +149,13 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
 pub fn page_up(view: &mut View, _count: usize) {
     let text = &view.state.doc;
     view.first_line = view.first_line.saturating_sub(view.size.1);
-    let pos = text.line_to_char(view.first_line as usize);
+    let pos = text.line_to_char(view.last_line() as usize);
 
-    view.state.selection = Selection::single(pos, pos);
+    if !check_cursor_in_view(view) {
+        let text = &view.state.doc;
+        let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));
+        view.state.selection = Selection::single(pos, pos);
+    }
 }
 
 pub fn page_down(view: &mut View, _count: usize) {
@@ -168,13 +171,14 @@ pub fn half_page_up(view: &mut View, _count: usize) {
     view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
     if !check_cursor_in_view(view) {
         let text = &view.state.doc;
-        let pos = text.line_to_char(view.first_line as usize);
+        let pos = text.line_to_char(view.last_line() - PADDING as usize);
         view.state.selection = Selection::single(pos, pos);
     }
 }
 
 pub fn half_page_down(view: &mut View, _count: usize) {
-    if view.first_line < view.state.doc().len_lines() as u16 - view.size.1 {
+    let lines = view.state.doc().len_lines();
+    if view.first_line < lines.saturating_sub(view.size.1 as usize) as u16 {
         view.first_line += view.size.1 / 2;
     }
     if !check_cursor_in_view(view) {
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 0e6705f0..6ef5ee6f 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -34,7 +34,7 @@ impl View {
     pub fn ensure_cursor_in_view(&mut self) {
         let cursor = self.state.selection().cursor();
         let line = self.state.doc().char_to_line(cursor) as u16;
-        let document_end = self.first_line + self.size.1.saturating_sub(2);
+        let document_end = self.first_line + self.size.1.saturating_sub(1);
 
         let padding = 5u16;
 
-- 
cgit v1.2.3-70-g09d2


From 7f07e6676801be72e5a58b5612893c7d16f94a64 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Tue, 6 Oct 2020 17:32:30 +0900
Subject: Cleanup: track first_line as usize.

---
 helix-term/src/editor.rs   |  2 +-
 helix-view/src/commands.rs | 28 ++++++++++++++--------------
 helix-view/src/view.rs     | 10 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'helix-view')

diff --git a/helix-term/src/editor.rs b/helix-term/src/editor.rs
index acb742b2..09d66c5a 100644
--- a/helix-term/src/editor.rs
+++ b/helix-term/src/editor.rs
@@ -219,7 +219,7 @@ impl Editor {
                 }
 
                 let style: Style = view.theme.get("ui.linenr");
-                for (i, line) in (view.first_line..(last_line as u16)).enumerate() {
+                for (i, line) in (view.first_line..last_line).enumerate() {
                     self.surface
                         .set_stringn(0, i as u16, format!("{:>5}", line + 1), 5, style);
                     // lavender
diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index 9ebdb4c4..19853c37 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -13,7 +13,7 @@ use crate::view::View;
 /// state (usually by creating and applying a transaction).
 pub type Command = fn(view: &mut View, count: usize);
 
-const PADDING: u16 = 5;
+const PADDING: usize = 5;
 
 pub fn move_char_left(view: &mut View, count: usize) {
     // TODO: use a transaction
@@ -137,8 +137,8 @@ pub fn move_file_end(view: &mut View, _count: usize) {
 
 pub fn check_cursor_in_view(view: &mut View) -> bool {
     let cursor = view.state.selection().cursor();
-    let line = view.state.doc().char_to_line(cursor) as u16;
-    let document_end = view.first_line + view.size.1.saturating_sub(1);
+    let line = view.state.doc().char_to_line(cursor);
+    let document_end = view.first_line + view.size.1.saturating_sub(1) as usize;
 
     if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
         return false;
@@ -147,28 +147,28 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
 }
 
 pub fn page_up(view: &mut View, _count: usize) {
-    let text = &view.state.doc;
-    view.first_line = view.first_line.saturating_sub(view.size.1);
-    let pos = text.line_to_char(view.last_line() as usize);
+    view.first_line = view.first_line.saturating_sub(view.size.1 as usize);
 
     if !check_cursor_in_view(view) {
-        let text = &view.state.doc;
+        let text = view.state.doc();
         let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));
         view.state.selection = Selection::single(pos, pos);
     }
 }
 
 pub fn page_down(view: &mut View, _count: usize) {
-    let text = &view.state.doc;
-    view.first_line += view.size.1 + PADDING;
-    if view.first_line < view.state.doc().len_lines() as u16 {
+    view.first_line += view.size.1 as usize + PADDING;
+
+    if view.first_line < view.state.doc().len_lines() {
+        let text = view.state.doc();
         let pos = text.line_to_char(view.first_line as usize);
         view.state.selection = Selection::single(pos, pos);
     }
 }
 
 pub fn half_page_up(view: &mut View, _count: usize) {
-    view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
+    view.first_line = view.first_line.saturating_sub(view.size.1 as usize / 2);
+
     if !check_cursor_in_view(view) {
         let text = &view.state.doc;
         let pos = text.line_to_char(view.last_line() - PADDING as usize);
@@ -178,11 +178,11 @@ pub fn half_page_up(view: &mut View, _count: usize) {
 
 pub fn half_page_down(view: &mut View, _count: usize) {
     let lines = view.state.doc().len_lines();
-    if view.first_line < lines.saturating_sub(view.size.1 as usize) as u16 {
-        view.first_line += view.size.1 / 2;
+    if view.first_line < lines.saturating_sub(view.size.1 as usize) {
+        view.first_line += view.size.1 as usize / 2;
     }
     if !check_cursor_in_view(view) {
-        let text = &view.state.doc;
+        let text = view.state.doc();
         let pos = text.line_to_char(view.first_line as usize);
         view.state.selection = Selection::single(pos, pos);
     }
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 6ef5ee6f..887c45a2 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -11,7 +11,7 @@ use tui::layout::Rect;
 
 pub struct View {
     pub state: State,
-    pub first_line: u16,
+    pub first_line: usize,
     pub size: (u16, u16),
     pub theme: Theme, // TODO: share one instance
 }
@@ -33,10 +33,10 @@ impl View {
 
     pub fn ensure_cursor_in_view(&mut self) {
         let cursor = self.state.selection().cursor();
-        let line = self.state.doc().char_to_line(cursor) as u16;
-        let document_end = self.first_line + self.size.1.saturating_sub(1);
+        let line = self.state.doc().char_to_line(cursor);
+        let document_end = self.first_line + (self.size.1 as usize).saturating_sub(1);
 
-        let padding = 5u16;
+        let padding = 5usize;
 
         // TODO: side scroll
 
@@ -54,7 +54,7 @@ impl View {
     pub fn last_line(&self) -> usize {
         let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
         std::cmp::min(
-            (self.first_line + viewport.height) as usize,
+            self.first_line + (viewport.height as usize),
             self.state.doc().len_lines() - 1,
         )
     }
-- 
cgit v1.2.3-70-g09d2