0c2b993 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

commands: Handle `t<ENTER>` as till newline

0c2b993Wojciech Kępka5 years ago

helix-term/src/commands.rs+26−20

compare with master

unifiedsplit

@@ -348,28 +348,34 @@ where

348

349 // need to wait for next key

350 cx.on_next_key(move |cx, event| {

351− if let KeyEvent {

352− code: KeyCode::Char(ch),

353− ..

354− } = event

351+ let ch = match event {

355− {

352+ KeyEvent {

356− let (view, doc) = cx.current();

353+ code: KeyCode::Enter,

357− let text = doc.text().slice(..);

354+ ..

355+ } => '\n',

356+ KeyEvent {

357+ code: KeyCode::Char(ch),

358+ ..

359+ } => ch,

360+ _ => return,

361+ };

358

362

359− let selection = doc.selection(view.id).transform(|mut range| {

363+ let (view, doc) = cx.current();

360− search_fn(text, ch, range.head, count, inclusive).map_or(range, |pos| {

364+ let text = doc.text().slice(..);

361− if extend {

362− Range::new(range.anchor, pos)

363− } else {

364− // select

365− Range::new(range.head, pos)

366− }

367− // or (pos, pos) to move to found val

368− })

369− });

370

365

366+ let selection = doc.selection(view.id).transform(|mut range| {

367+ search_fn(text, ch, range.head, count, inclusive).map_or(range, |pos| {

368+ if extend {

369+ Range::new(range.anchor, pos)

370+ } else {

371+ // select

372+ Range::new(range.head, pos)

373+ }

374+ // or (pos, pos) to move to found val

375+ })

376+ });

377+

371− doc.set_selection(view.id, selection);

378+ doc.set_selection(view.id, selection);

372− }

373 })

379 })

374}

380}

375

381