59c691d · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Highlight matching text in file picker suggestions (#1635)

59c691dLudwig Stecher5 years ago

helix-term/src/ui/editor.rs+2−2

compare with master

unifiedsplit

@@ -688,12 +688,12 @@ impl EditorView {

688 surface.set_string_truncated(

689 viewport.x + 8, // 8: 1 space + 3 char mode string + 1 space + 1 spinner + 1 space

690 viewport.y,

691− title,

691+ &title,

692 viewport

693 .width

694 .saturating_sub(6)

695 .saturating_sub(right_side_text.width() as u16 + 1) as usize, // "+ 1": a space between the title and the selection info

696− base_style,

696+ |_| base_style,

697 true,

698 true,

699 );

helix-term/src/ui/picker.rs+27−13

@@ -24,7 +24,7 @@ use crate::ui::{Prompt, PromptEvent};

24use helix_core::{movement::Direction, Position};

25use helix_view::{

26 editor::Action,

27− graphics::{Color, CursorKind, Margin, Rect, Style},

27+ graphics::{Color, CursorKind, Margin, Modifier, Rect, Style},

28 Document, Editor,

29};

@@ -343,7 +343,7 @@ impl<T> Picker<T> {

343 }

344 // TODO: maybe using format_fn isn't the best idea here

345 let text = (self.format_fn)(option);

346− // TODO: using fuzzy_indices could give us the char idx for match highlighting

346+ // Highlight indices are computed lazily in the render function

347 self.matcher

348 .fuzzy_match(&text, pattern)

349 .map(|score| (index, score))

@@ -483,6 +483,8 @@ impl<T: 'static> Component for Picker<T> {

483

484 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {

485 let text_style = cx.editor.theme.get("ui.text");

486+ let selected = cx.editor.theme.get("ui.text.focus");

487+ let highlighted = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);

486

488

487 // -- Render the frame:

489 // -- Render the frame:

488 // clear area

490 // clear area

@@ -525,29 +527,41 @@ impl<T: 'static> Component for Picker<T> {

525 // subtract area of prompt from top and current item marker " > " from left

527 // subtract area of prompt from top and current item marker " > " from left

526 let inner = inner.clip_top(2).clip_left(3);

528 let inner = inner.clip_top(2).clip_left(3);

527

529

528− let selected = cx.editor.theme.get("ui.text.focus");

529−

530 let rows = inner.height;

531 let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));

532

533− let files = self.matches.iter().skip(offset).map(|(index, _score)| {

533+ let files = self

534+ .matches

535+ .iter_mut()

536+ .skip(offset)

534− (index, self.options.get(*index).unwrap()) // get_unchecked

537+ .map(|(index, _score)| (*index, self.options.get(*index).unwrap()));

535− });

536

538

537 for (i, (_index, option)) in files.take(rows as usize).enumerate() {

539 for (i, (_index, option)) in files.take(rows as usize).enumerate() {

538− if i == (self.cursor - offset) {

540+ let is_active = i == (self.cursor - offset);

541+ if is_active {

539 surface.set_string(inner.x.saturating_sub(2), inner.y + i as u16, ">", selected);

542 surface.set_string(inner.x.saturating_sub(2), inner.y + i as u16, ">", selected);

540 }

543 }

541

544

545+ let formatted = (self.format_fn)(option);

546+

547+ let (_score, highlights) = self

548+ .matcher

549+ .fuzzy_indices(&formatted, &self.prompt.line)

550+ .unwrap_or_default();

551+

542 surface.set_string_truncated(

552 surface.set_string_truncated(

543 inner.x,

553 inner.x,

544 inner.y + i as u16,

554 inner.y + i as u16,

545− (self.format_fn)(option),

555+ &formatted,

546 inner.width as usize,

556 inner.width as usize,

547− if i == (self.cursor - offset) {

557+ |idx| {

558+ if highlights.contains(&idx) {

559+ highlighted

560+ } else if is_active {

548− selected

561+ selected

549− } else {

562+ } else {

550− text_style

563+ text_style

564+ }

551 },

565 },

552 true,

566 true,

553 self.truncate_start,

567 self.truncate_start,

helix-tui/src/buffer.rs+55−15

@@ -287,7 +287,7 @@ impl Buffer {

287 where

288 S: AsRef<str>,

289 {

290− self.set_string_truncated(x, y, string, width, style, false, false)

290+ self.set_string_truncated_at_end(x, y, string.as_ref(), width, style)

291 }

292

293 /// Print at most the first `width` characters of a string if enough space is available

@@ -295,19 +295,16 @@ impl Buffer {

295 /// truncated lines. If `truncate_start` is `true`, truncate the beginning of the string

296 /// instead of the end.

297 #[allow(clippy::too_many_arguments)]

298− pub fn set_string_truncated<S>(

298+ pub fn set_string_truncated(

299 &mut self,

300 x: u16,

301 y: u16,

302− string: S,

302+ string: &str,

303 width: usize,

304− style: Style,

304+ style: impl Fn(usize) -> Style, // Map a grapheme's string offset to a style

305 ellipsis: bool,

306 truncate_start: bool,

307− ) -> (u16, u16)

307+ ) -> (u16, u16) {

308− where

309− S: AsRef<str>,

310− {

311 // prevent panic if out of range

308 // prevent panic if out of range

312 if !self.in_bounds(x, y) || width == 0 {

309 if !self.in_bounds(x, y) || width == 0 {

313 return (x, y);

310 return (x, y);

@@ -316,10 +313,10 @@ impl Buffer {

316 let mut index = self.index_of(x, y);

313 let mut index = self.index_of(x, y);

317 let mut x_offset = x as usize;

314 let mut x_offset = x as usize;

318 let width = if ellipsis { width - 1 } else { width };

315 let width = if ellipsis { width - 1 } else { width };

319− let graphemes = UnicodeSegmentation::graphemes(string.as_ref(), true);

316+ let graphemes = string.grapheme_indices(true);

320 let max_offset = min(self.area.right() as usize, width.saturating_add(x as usize));

317 let max_offset = min(self.area.right() as usize, width.saturating_add(x as usize));

321 if !truncate_start {

318 if !truncate_start {

322− for s in graphemes {

319+ for (byte_offset, s) in graphemes {

323 let width = s.width();

320 let width = s.width();

324 if width == 0 {

321 if width == 0 {

325 continue;

322 continue;

@@ -331,7 +328,7 @@ impl Buffer {

331 }

328 }

332

329

333 self.content[index].set_symbol(s);

330 self.content[index].set_symbol(s);

334− self.content[index].set_style(style);

331+ self.content[index].set_style(style(byte_offset));

335 // Reset following cells if multi-width (they would be hidden by the grapheme),

332 // Reset following cells if multi-width (they would be hidden by the grapheme),

336 for i in index + 1..index + width {

333 for i in index + 1..index + width {

337 self.content[i].reset();

334 self.content[i].reset();

@@ -339,14 +336,14 @@ impl Buffer {

339 index += width;

336 index += width;

340 x_offset += width;

337 x_offset += width;

341 }

338 }

342− if ellipsis && x_offset - (x as usize) < string.as_ref().width() {

339+ if ellipsis && x_offset - (x as usize) < string.width() {

343 self.content[index].set_symbol("…");

340 self.content[index].set_symbol("…");

344 }

341 }

345 } else {

342 } else {

346 let mut start_index = self.index_of(x, y);

343 let mut start_index = self.index_of(x, y);

347 let mut index = self.index_of(max_offset as u16, y);

344 let mut index = self.index_of(max_offset as u16, y);

348

345

349− let total_width = string.as_ref().width();

346+ let total_width = string.width();

350 let truncated = total_width > width;

347 let truncated = total_width > width;

351 if ellipsis && truncated {

348 if ellipsis && truncated {

352 self.content[start_index].set_symbol("…");

349 self.content[start_index].set_symbol("…");

@@ -355,7 +352,7 @@ impl Buffer {

355 if !truncated {

352 if !truncated {

356 index -= width - total_width;

353 index -= width - total_width;

357 }

354 }

358− for s in graphemes.rev() {

355+ for (byte_offset, s) in graphemes.rev() {

359 let width = s.width();

356 let width = s.width();

360 if width == 0 {

357 if width == 0 {

361 continue;

358 continue;

@@ -365,7 +362,7 @@ impl Buffer {

365 break;

362 break;

366 }

363 }

367 self.content[start].set_symbol(s);

364 self.content[start].set_symbol(s);

368− self.content[start].set_style(style);

365+ self.content[start].set_style(style(byte_offset));

369 for i in start + 1..index {

366 for i in start + 1..index {

370 self.content[i].reset();

367 self.content[i].reset();

371 }

368 }

@@ -375,6 +372,49 @@ impl Buffer {

375 (x_offset as u16, y)

372 (x_offset as u16, y)

376 }

373 }

377

374

375+ /// Print at most the first `width` characters of a string if enough space is available

376+ /// until the end of the line.

377+ pub fn set_string_truncated_at_end(

378+ &mut self,

379+ x: u16,

380+ y: u16,

381+ string: &str,

382+ width: usize,

383+ style: Style,

384+ ) -> (u16, u16) {

385+ // prevent panic if out of range

386+ if !self.in_bounds(x, y) {

387+ return (x, y);

388+ }

389+

390+ let mut index = self.index_of(x, y);

391+ let mut x_offset = x as usize;

392+ let max_x_offset = min(self.area.right() as usize, width.saturating_add(x as usize));

393+

394+ for s in string.graphemes(true) {

395+ let width = s.width();

396+ if width == 0 {

397+ continue;

398+ }

399+ // `x_offset + width > max_offset` could be integer overflow on 32-bit machines if we

400+ // change dimensions to usize or u32 and someone resizes the terminal to 1x2^32.

401+ if width > max_x_offset.saturating_sub(x_offset) {

402+ break;

403+ }

404+

405+ self.content[index].set_symbol(s);

406+ self.content[index].set_style(style);

407+ // Reset following cells if multi-width (they would be hidden by the grapheme),

408+ for i in index + 1..index + width {

409+ self.content[i].reset();

410+ }

411+ index += width;

412+ x_offset += width;

413+ }

414+

415+ (x_offset as u16, y)

416+ }

417+

378 pub fn set_spans<'a>(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) -> (u16, u16) {

418 pub fn set_spans<'a>(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) -> (u16, u16) {

379 let mut remaining_width = width;

419 let mut remaining_width = width;

380 let mut x = x;

420 let mut x = x;