TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Cleanup: track first_line as usize.

Browse source
This commit is contained in:
Blaž Hrastnik 2020-10-06 17:32:30 +09:00
parent 5392b48268
commit 7f07e66768
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helix-term/src/editor.rs
View file

@ -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

28
helix-view/src/commands.rs
View file

@ -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);
}

10
helix-view/src/view.rs
View file

@ -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,
)
}