git.iko.soy/helix
on master help sign in
Cleanup: track first_line as usize.
7f07e66Blaž Hrastnik
helix-term/src/editor.rs+1−1
compare with master
unifiedsplit
@@ -219,7 +219,7 @@ impl Editor {
219 }
219 }
220
220
221 let style: Style = view.theme.get("ui.linenr");
221 let style: Style = view.theme.get("ui.linenr");
222− for (i, line) in (view.first_line..(last_line as u16)).enumerate() {
222+ for (i, line) in (view.first_line..last_line).enumerate() {
223 self.surface
223 self.surface
224 .set_stringn(0, i as u16, format!("{:>5}", line + 1), 5, style);
224 .set_stringn(0, i as u16, format!("{:>5}", line + 1), 5, style);
225 // lavender
225 // lavender
helix-view/src/commands.rs+14−14
@@ -13,7 +13,7 @@ use crate::view::View;
13/// state (usually by creating and applying a transaction).
13/// state (usually by creating and applying a transaction).
14pub type Command = fn(view: &mut View, count: usize);
14pub type Command = fn(view: &mut View, count: usize);
15
15
16−const PADDING: u16 = 5;
16+const PADDING: usize = 5;
17
17
18pub fn move_char_left(view: &mut View, count: usize) {
18pub fn move_char_left(view: &mut View, count: usize) {
19 // TODO: use a transaction
19 // TODO: use a transaction
@@ -137,8 +137,8 @@ pub fn move_file_end(view: &mut View, _count: usize) {
137
137
138pub fn check_cursor_in_view(view: &mut View) -> bool {
138pub fn check_cursor_in_view(view: &mut View) -> bool {
139 let cursor = view.state.selection().cursor();
139 let cursor = view.state.selection().cursor();
140− let line = view.state.doc().char_to_line(cursor) as u16;
140+ let line = view.state.doc().char_to_line(cursor);
141− let document_end = view.first_line + view.size.1.saturating_sub(1);
141+ let document_end = view.first_line + view.size.1.saturating_sub(1) as usize;
142
142
143 if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
143 if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
144 return false;
144 return false;
@@ -147,28 +147,28 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {
147}
147}
148
148
149pub fn page_up(view: &mut View, _count: usize) {
149pub fn page_up(view: &mut View, _count: usize) {
150− let text = &view.state.doc;
151− view.first_line = view.first_line.saturating_sub(view.size.1);
150+ view.first_line = view.first_line.saturating_sub(view.size.1 as usize);
152− let pos = text.line_to_char(view.last_line() as usize);
153
151
154 if !check_cursor_in_view(view) {
152 if !check_cursor_in_view(view) {
155− let text = &view.state.doc;
153+ let text = view.state.doc();
156 let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));
154 let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));
157 view.state.selection = Selection::single(pos, pos);
155 view.state.selection = Selection::single(pos, pos);
158 }
156 }
159}
157}
160
158
161pub fn page_down(view: &mut View, _count: usize) {
159pub fn page_down(view: &mut View, _count: usize) {
162− let text = &view.state.doc;
163− view.first_line += view.size.1 + PADDING;
160+ view.first_line += view.size.1 as usize + PADDING;
161+
164− if view.first_line < view.state.doc().len_lines() as u16 {
162+ if view.first_line < view.state.doc().len_lines() {
163+ let text = view.state.doc();
165 let pos = text.line_to_char(view.first_line as usize);
164 let pos = text.line_to_char(view.first_line as usize);
166 view.state.selection = Selection::single(pos, pos);
165 view.state.selection = Selection::single(pos, pos);
167 }
166 }
168}
167}
169
168
170pub fn half_page_up(view: &mut View, _count: usize) {
169pub fn half_page_up(view: &mut View, _count: usize) {
171− view.first_line = view.first_line.saturating_sub(view.size.1 / 2);
170+ view.first_line = view.first_line.saturating_sub(view.size.1 as usize / 2);
171+
172 if !check_cursor_in_view(view) {
172 if !check_cursor_in_view(view) {
173 let text = &view.state.doc;
173 let text = &view.state.doc;
174 let pos = text.line_to_char(view.last_line() - PADDING as usize);
174 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) {
178
178
179pub fn half_page_down(view: &mut View, _count: usize) {
179pub fn half_page_down(view: &mut View, _count: usize) {
180 let lines = view.state.doc().len_lines();
180 let lines = view.state.doc().len_lines();
181− if view.first_line < lines.saturating_sub(view.size.1 as usize) as u16 {
181+ if view.first_line < lines.saturating_sub(view.size.1 as usize) {
182− view.first_line += view.size.1 / 2;
182+ view.first_line += view.size.1 as usize / 2;
183 }
183 }
184 if !check_cursor_in_view(view) {
184 if !check_cursor_in_view(view) {
185− let text = &view.state.doc;
185+ let text = view.state.doc();
186 let pos = text.line_to_char(view.first_line as usize);
186 let pos = text.line_to_char(view.first_line as usize);
187 view.state.selection = Selection::single(pos, pos);
187 view.state.selection = Selection::single(pos, pos);
188 }
188 }
helix-view/src/view.rs+5−5
@@ -11,7 +11,7 @@ use tui::layout::Rect;
11
11
12pub struct View {
12pub struct View {
13 pub state: State,
13 pub state: State,
14− pub first_line: u16,
14+ pub first_line: usize,
15 pub size: (u16, u16),
15 pub size: (u16, u16),
16 pub theme: Theme, // TODO: share one instance
16 pub theme: Theme, // TODO: share one instance
17}
17}
@@ -33,10 +33,10 @@ impl View {
33
33
34 pub fn ensure_cursor_in_view(&mut self) {
34 pub fn ensure_cursor_in_view(&mut self) {
35 let cursor = self.state.selection().cursor();
35 let cursor = self.state.selection().cursor();
36− let line = self.state.doc().char_to_line(cursor) as u16;
36+ let line = self.state.doc().char_to_line(cursor);
37− let document_end = self.first_line + self.size.1.saturating_sub(1);
37+ let document_end = self.first_line + (self.size.1 as usize).saturating_sub(1);
38
38
39− let padding = 5u16;
39+ let padding = 5usize;
40
40
41 // TODO: side scroll
41 // TODO: side scroll
42
42
@@ -54,7 +54,7 @@ impl View {
54 pub fn last_line(&self) -> usize {
54 pub fn last_line(&self) -> usize {
55 let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
55 let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline
56 std::cmp::min(
56 std::cmp::min(
57− (self.first_line + viewport.height) as usize,
57+ self.first_line + (viewport.height as usize),
58 self.state.doc().len_lines() - 1,
58 self.state.doc().len_lines() - 1,
59 )
59 )
60 }
60 }