refactor: move line creation inside model

This commit is contained in:
graelo 2020-06-01 20:12:02 +02:00
parent 005fa7890f
commit aeca7223a6
3 changed files with 51 additions and 62 deletions

View file

@ -314,7 +314,7 @@ impl<'a> Ui<'a> {
/// and `hint` are rendered in their proper position.
fn full_render(&self, stdout: &mut dyn io::Write) -> () {
// 1. Trim all lines and render non-empty ones.
Ui::render_base_text(stdout, self.model.lines, &self.rendering_colors);
Ui::render_base_text(stdout, &self.model.lines, &self.rendering_colors);
for (index, mat) in self.matches.iter().enumerate() {
let focused = index == self.focus_index;
@ -798,12 +798,10 @@ path: /usr/local/bin/cargo";
Barcelona https://en.wikipedia.org/wiki/Barcelona - ";
let lines = content.split('\n').collect();
let named_pat = vec![];
let custom_regexes = vec![];
let alphabet = alphabets::Alphabet("abcd".to_string());
let mut model = model::Model::new(&lines, &alphabet, &named_pat, &custom_regexes, false);
let mut model = model::Model::new(content, &alphabet, &named_pat, &custom_regexes, false);
let rendering_colors = UiColors {
text_fg: Box::new(color::Black),
text_bg: Box::new(color::White),
@ -861,13 +859,11 @@ Barcelona https://en.wikipedia.org/wiki/Barcelona - ";
Barcelona https://en.wikipedia.org/wiki/Barcelona - ";
let lines = content.split('\n').collect();
let named_pat = vec![];
let custom_regexes = vec![];
let alphabet = alphabets::Alphabet("abcd".to_string());
let reverse = true;
let mut model = model::Model::new(&lines, &alphabet, &named_pat, &custom_regexes, reverse);
let mut model = model::Model::new(content, &alphabet, &named_pat, &custom_regexes, reverse);
let unique_hint = false;
let wrap_around = false;