a5c4314 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

commands: Improve scroll functions.

a5c4314Blaž Hrastnik6 years ago

helix-term/src/commands.rs+40−40

compare with master

unifiedsplit

@@ -4,8 +4,8 @@ use helix_core::{

4 object,

5 regex::{self, Regex},

6 register, selection,

7− state::{Direction, Granularity, State},

7+ state::{coords_at_pos, pos_at_coords, Direction, Granularity, State},

8− Change, ChangeSet, Range, Selection, Tendril, Transaction,

8+ Change, ChangeSet, Position, Range, Selection, Tendril, Transaction,

9};

11use once_cell::sync::Lazy;

@@ -222,62 +222,60 @@ pub fn extend_next_word_end(cx: &mut Context) {

222 doc.set_selection(selection);

223}

224

225−pub fn page_up(cx: &mut Context) {

225+fn scroll(view: &mut View, offset: usize, direction: Direction) {

226− let view = cx.view();

226+ use Direction::*;

227+ let text = view.doc.text().slice(..);

228+

229+ let last_line = view.last_line();

230+ let cursor = coords_at_pos(text, view.doc.selection().cursor());

231+ let doc_last_line = text.len_lines() - 1;

232+

227− if view.first_line < PADDING {

233+ if direction == Backward && view.first_line == 0

234+ || direction == Forward && last_line == doc_last_line

235+ {

228 return;

236 return;

229 }

237 }

230

238

231− view.first_line = view.first_line.saturating_sub(view.area.height as usize);

239+ let scrolloff = PADDING; // min(user pref, half win width/height)

240+

241+ // cursor visual offset

242+ let cursor_off = cursor.row - view.first_line;

232

243

233− if !view.check_cursor_in_view() {

244+ view.first_line = match direction {

234− let text = view.doc.text();

245+ Forward => view.first_line + offset,

235− let pos = text.line_to_char(view.last_line().saturating_sub(PADDING));

246+ Backward => view.first_line.saturating_sub(offset),

236− view.doc.set_selection(Selection::point(pos));

237 }

247 }

248+ .min(doc_last_line);

249+

250+ // clamp into viewport

251+ let line = (view.first_line + cursor_off).clamp(

252+ view.first_line + scrolloff,

253+ view.first_line + view.last_line().saturating_sub(scrolloff),

254+ );

255+

256+ let pos = pos_at_coords(text, Position::new(line, cursor.col)); // this func will properly truncate to line end

257+ view.doc.set_selection(Selection::point(pos));

238}

258}

239

259

240−pub fn page_down(cx: &mut Context) {

260+pub fn page_up(cx: &mut Context) {

241 let view = cx.view();

261 let view = cx.view();

242− view.first_line += view.area.height as usize + PADDING;

262+ scroll(view, view.area.height as usize, Direction::Backward);

263+}

243

264

244− if view.first_line < view.doc.text().len_lines() {

265+pub fn page_down(cx: &mut Context) {

245− let text = view.doc.text();

266+ let view = cx.view();

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

267+ scroll(view, view.area.height as usize, Direction::Forward);

247− view.doc.set_selection(Selection::point(pos));

248− }

249}

268}

250

269

251pub fn half_page_up(cx: &mut Context) {

270pub fn half_page_up(cx: &mut Context) {

252 let view = cx.view();

271 let view = cx.view();

253− if view.first_line < PADDING {

254− return;

255− }

256−

257− view.first_line = view

258− .first_line

259− .saturating_sub(view.area.height as usize / 2);

272+ scroll(view, view.area.height as usize / 2, Direction::Backward);

260−

261− if !view.check_cursor_in_view() {

262− let text = &view.doc.text();

263− let pos = text.line_to_char(view.last_line() - PADDING);

264− view.doc.set_selection(Selection::point(pos));

265− }

266}

273}

267

274

268pub fn half_page_down(cx: &mut Context) {

275pub fn half_page_down(cx: &mut Context) {

269 let view = cx.view();

276 let view = cx.view();

270− let lines = view.doc.text().len_lines();

271− if view.first_line < lines.saturating_sub(view.area.height as usize) {

272− view.first_line += view.area.height as usize / 2;

277+ scroll(view, view.area.height as usize / 2, Direction::Forward);

273− }

274− if !view.check_cursor_in_view() {

275− let text = view.doc.text();

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

277− view.doc.set_selection(Selection::point(pos));

278− }

279}

278}

280−// avoid select by default by having a visual mode switch that makes movements into selects

281

279

282pub fn extend_char_left(cx: &mut Context) {

280pub fn extend_char_left(cx: &mut Context) {

283 let count = cx.count;

281 let count = cx.count;

@@ -439,8 +437,10 @@ pub fn search_selection(cx: &mut Context) {

439pub fn select_line(cx: &mut Context) {

437pub fn select_line(cx: &mut Context) {

440 let count = cx.count;

438 let count = cx.count;

441 let doc = cx.doc();

439 let doc = cx.doc();

440+

442 let pos = doc.selection().primary();

441 let pos = doc.selection().primary();

443 let text = doc.text();

442 let text = doc.text();

443+

444 let line = text.char_to_line(pos.head);

445 let start = text.line_to_char(line);

446 let end = text.line_to_char(line + count).saturating_sub(1);

helix-view/src/view.rs−11

@@ -35,17 +35,6 @@ impl View {

35 Ok(view)

36 }

38− pub fn check_cursor_in_view(&self) -> bool {

39− let cursor = self.doc.selection().cursor();

40− let line = self.doc.text().char_to_line(cursor);

41− let document_end = self.first_line + self.area.height.saturating_sub(1) as usize;

42−

43− if (line > document_end.saturating_sub(PADDING)) || (line < self.first_line + PADDING) {

44− return false;

45− }

46− true

47− }

48−

49 pub fn ensure_cursor_in_view(&mut self) {

38 pub fn ensure_cursor_in_view(&mut self) {

50 let cursor = self.doc.state.selection().cursor();

39 let cursor = self.doc.state.selection().cursor();

51 let line = self.doc.text().char_to_line(cursor);

40 let line = self.doc.text().char_to_line(cursor);