7f07e66 · helix · git.iko.soy

git.iko.soy/helix

Cleanup: track first_line as usize.

commit7f07e6676801be72e5a58b5612893c7d16f94a64 authorBlaž Hrastnik <blaz@mxxn.io> dateTue 6 Oct 2020, 17:32 (6 years ago) parent5392b48

3 files changed+20−20

compare with master

unifiedsplit

helix-term/src/editor.rs+1−1 helix-view/src/commands.rs+14−14 helix-view/src/view.rs+5−5

helix-term/src/editor.rs+1−1

@@ -219,7 +219,7 @@ impl Editor {

219219 }

220220

221221 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() {

223223 self.surface

224224 .set_stringn(0, i as u16, format!("{:>5}", line + 1), 5, style);

225225 // lavender

helix-view/src/commands.rs+14−14

@@ -13,7 +13,7 @@ use crate::view::View;

1313/// state (usually by creating and applying a transaction).

1414pub type Command = fn(view: &mut View, count: usize);

1515

16−const PADDING: u16 = 5;

16+const PADDING: usize = 5;

1717

1818pub fn move_char_left(view: &mut View, count: usize) {

1919 // TODO: use a transaction

@@ -137,8 +137,8 @@ pub fn move_file_end(view: &mut View, _count: usize) {

137137

138138pub fn check_cursor_in_view(view: &mut View) -> bool {

139139 let cursor = view.state.selection().cursor();

140− let line = view.state.doc().char_to_line(cursor) as u16;

141− let document_end = view.first_line + view.size.1.saturating_sub(1);

140+ let line = view.state.doc().char_to_line(cursor);

141+ let document_end = view.first_line + view.size.1.saturating_sub(1) as usize;

142142

143143 if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {

144144 return false;

@@ -147,28 +147,28 @@ pub fn check_cursor_in_view(view: &mut View) -> bool {

147147}

148148

149149pub 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);

152− let pos = text.line_to_char(view.last_line() as usize);

150+ view.first_line = view.first_line.saturating_sub(view.size.1 as usize);

153151

154152 if !check_cursor_in_view(view) {

155− let text = &view.state.doc;

153+ let text = view.state.doc();

156154 let pos = text.line_to_char(view.last_line().saturating_sub(PADDING as usize));

157155 view.state.selection = Selection::single(pos, pos);

158156 }

159157}

160158

161159pub fn page_down(view: &mut View, _count: usize) {

162− let text = &view.state.doc;

163− view.first_line += view.size.1 + PADDING;

164− if view.first_line < view.state.doc().len_lines() as u16 {

160+ view.first_line += view.size.1 as usize + PADDING;

161+

162+ if view.first_line < view.state.doc().len_lines() {

163+ let text = view.state.doc();

165164 let pos = text.line_to_char(view.first_line as usize);

166165 view.state.selection = Selection::single(pos, pos);

167166 }

168167}

169168

170169pub 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+

172172 if !check_cursor_in_view(view) {

173173 let text = &view.state.doc;

174174 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) {

178178

179179pub fn half_page_down(view: &mut View, _count: usize) {

180180 let lines = view.state.doc().len_lines();

181− if view.first_line < lines.saturating_sub(view.size.1 as usize) as u16 {

182− view.first_line += view.size.1 / 2;

181+ if view.first_line < lines.saturating_sub(view.size.1 as usize) {

182+ view.first_line += view.size.1 as usize / 2;

183183 }

184184 if !check_cursor_in_view(view) {

185− let text = &view.state.doc;

185+ let text = view.state.doc();

186186 let pos = text.line_to_char(view.first_line as usize);

187187 view.state.selection = Selection::single(pos, pos);

188188 }

helix-view/src/view.rs+5−5

@@ -11,7 +11,7 @@ use tui::layout::Rect;

1111

1212pub struct View {

1313 pub state: State,

14− pub first_line: u16,

14+ pub first_line: usize,

1515 pub size: (u16, u16),

1616 pub theme: Theme, // TODO: share one instance

1717}

@@ -33,10 +33,10 @@ impl View {

3333

3434 pub fn ensure_cursor_in_view(&mut self) {

3535 let cursor = self.state.selection().cursor();

36− let line = self.state.doc().char_to_line(cursor) as u16;

37− let document_end = self.first_line + self.size.1.saturating_sub(1);

36+ let line = self.state.doc().char_to_line(cursor);

37+ let document_end = self.first_line + (self.size.1 as usize).saturating_sub(1);

3838

39− let padding = 5u16;

39+ let padding = 5usize;

4040

4141 // TODO: side scroll

4242

@@ -54,7 +54,7 @@ impl View {

5454 pub fn last_line(&self) -> usize {

5555 let viewport = Rect::new(6, 0, self.size.0, self.size.1 - 1); // - 1 for statusline

5656 std::cmp::min(

57− (self.first_line + viewport.height) as usize,

57+ self.first_line + (viewport.height as usize),

5858 self.state.doc().len_lines() - 1,

5959 )

6060 }