Skip to content

GitLab

L
liner
Commit 95122a41 authored by AdminXVII's avatar AdminXVII
Browse files
Options

On prompt, exit to normal buffer and reenable cursor keys

parent c3bc4640
Pipeline #3849 passed with stage
    in 2 minutes and 14 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 107 additions and 73 deletions
    src/editor.rs
    View file @ 95122a41
    ......@@ -4,10 +4,10 @@ use std::io::{self, Write};
    use termion::{self, clear, color, cursor};
    use context::ColorClosure;
    use Context;
    use Buffer;
    use event::*;
    use util;
    use Buffer;
    use Context;
    /// Buffer for prompt writes, meant to be shared between prompt creations.
    struct LocalBuffer(pub RefCell<Vec<u8>>);
    ......@@ -141,13 +141,13 @@ macro_rules! cur_buf_mut {
    Some(i) => {
    $s.buffer_changed = true;
    &mut $s.context.history[i]
    },
    }
    _ => {
    $s.buffer_changed = true;
    &mut $s.new_buf
    },
    }
    }
    }
    };
    }
    macro_rules! cur_buf {
    ......@@ -156,7 +156,7 @@ macro_rules! cur_buf {
    Some(i) => &$s.context.history[i],
    _ => &$s.new_buf,
    }
    }
    };
    }
    impl<'a, W: Write> Editor<'a, W> {
    ......@@ -164,7 +164,7 @@ impl<'a, W: Write> Editor<'a, W> {
    out: W,
    prompt: P,
    f: Option<ColorClosure>,
    context: &'a mut Context
    context: &'a mut Context,
    ) -> io::Result<Self> {
    Editor::new_with_init_buffer(out, prompt, f, context, Buffer::new())
    }
    ......@@ -267,7 +267,8 @@ impl<'a, W: Write> Editor<'a, W> {
    fn search_history_loc(&self) -> Option<usize> {
    if self.history_subset_index.len() > 0 {
    self.history_subset_loc.map(|i| self.history_subset_index[i])
    self.history_subset_loc
    .map(|i| self.history_subset_index[i])
    } else {
    None
    }
    ......@@ -289,12 +290,11 @@ impl<'a, W: Write> Editor<'a, W> {
    if forward || target_loc == *history_loc || i == 0 {
    self.history_subset_loc = Some(i);
    } else {
    self.history_subset_loc = Some(i-1);
    self.history_subset_loc = Some(i - 1);
    }
    break;
    }
    }
    }
    } else {
    self.history_subset_loc = None;
    ......@@ -317,9 +317,17 @@ impl<'a, W: Write> Editor<'a, W> {
    } else if self.history_subset_index.len() > 0 {
    self.history_subset_loc = if let Some(p) = self.history_subset_loc {
    if forward {
    if p < self.history_subset_index.len() - 1 { Some(p + 1) } else { Some(0) }
    if p < self.history_subset_index.len() - 1 {
    Some(p + 1)
    } else {
    Some(0)
    }
    } else {
    if p > 0 { Some(p - 1) } else { Some(self.history_subset_index.len() - 1) }
    if p > 0 {
    Some(p - 1)
    } else {
    Some(self.history_subset_index.len() - 1)
    }
    }
    } else {
    None
    ......@@ -370,7 +378,10 @@ impl<'a, W: Write> Editor<'a, W> {
    Ok(did)
    }
    fn print_completion_list(completions: &[String], highlighted: Option<usize>) -> io::Result<usize> {
    fn print_completion_list(
    completions: &[String],
    highlighted: Option<usize>,
    ) -> io::Result<usize> {
    use std::cmp::max;
    let (w, _) = termion::terminal_size()?;
    ......@@ -409,7 +420,6 @@ impl<'a, W: Write> Editor<'a, W> {
    Ok(lines)
    })
    }
    pub fn skip_completions_hint(&mut self) {
    ......@@ -420,7 +430,7 @@ impl<'a, W: Write> Editor<'a, W> {
    handler(Event::new(self, EventKind::BeforeComplete));
    if let Some((completions, i)) = self.show_completions_hint.take() {
    let i = i.map_or(0, |i| (i+1) % completions.len());
    let i = i.map_or(0, |i| (i + 1) % completions.len());
    self.delete_word_before_cursor(false)?;
    self.insert_str_after_cursor(&completions[i])?;
    ......@@ -489,17 +499,21 @@ impl<'a, W: Write> Editor<'a, W> {
    let (words, pos) = self.get_words_and_cursor_position();
    match pos {
    CursorPosition::InWord(i) => Some(words[i]),
    CursorPosition::InSpace(Some(i), _) => if ignore_space_before_cursor {
    Some(words[i])
    } else {
    None
    },
    CursorPosition::InSpace(Some(i), _) => {
    if ignore_space_before_cursor {
    Some(words[i])
    } else {
    None
    }
    }
    CursorPosition::InSpace(None, _) => None,
    CursorPosition::OnWordLeftEdge(i) => if ignore_space_before_cursor && i > 0 {
    Some(words[i - 1])
    } else {
    None
    },
    CursorPosition::OnWordLeftEdge(i) => {
    if ignore_space_before_cursor && i > 0 {
    Some(words[i - 1])
    } else {
    None
    }
    }
    CursorPosition::OnWordRightEdge(i) => Some(words[i]),
    }
    }
    ......@@ -525,7 +539,7 @@ impl<'a, W: Write> Editor<'a, W> {
    pub fn clear(&mut self) -> io::Result<()> {
    BUFFER.with(|output_buf| {
    output_buf.append(clear::All.as_ref());
    output_buf.append(String::from(cursor::Goto(1,1)).as_bytes());
    output_buf.append(String::from(cursor::Goto(1, 1)).as_bytes());
    });
    self.term_cursor_line = 1;
    ......@@ -546,19 +560,24 @@ impl<'a, W: Write> Editor<'a, W> {
    self.cur_history_loc = Some(self.history_subset_index[i - 1]);
    }
    None => {
    self.history_subset_index = self.context.history.get_history_subset(&self.new_buf);
    self.history_subset_index =
    self.context.history.get_history_subset(&self.new_buf);
    if self.history_subset_index.len() > 0 {
    self.history_subset_loc = Some(self.history_subset_index.len() - 1);
    self.cur_history_loc = Some(self.history_subset_index[self.history_subset_index.len() - 1]);
    self.cur_history_loc = Some(
    self.history_subset_index[self.history_subset_index.len() - 1],
    );
    }
    }
    _ => ()
    _ => (),
    }
    } else {
    match self.cur_history_loc {
    Some(i) if i > 0 => self.cur_history_loc = Some(i - 1),
    None if self.context.history.len() > 0 => self.cur_history_loc = Some(self.context.history.len()-1),
    _ => ()
    None if self.context.history.len() > 0 => {
    self.cur_history_loc = Some(self.context.history.len() - 1)
    }
    _ => (),
    }
    }
    self.move_cursor_to_end_of_line()
    ......@@ -572,7 +591,7 @@ impl<'a, W: Write> Editor<'a, W> {
    } else {
    if self.new_buf.num_chars() > 0 {
    if let Some(i) = self.history_subset_loc {
    if i < self.history_subset_index.len()-1 {
    if i < self.history_subset_index.len() - 1 {
    self.history_subset_loc = Some(i + 1);
    self.cur_history_loc = Some(self.history_subset_index[i + 1]);
    } else {
    ......@@ -583,8 +602,10 @@ impl<'a, W: Write> Editor<'a, W> {
    }
    } else {
    match self.cur_history_loc.take() {
    Some(i) if i < self.context.history.len() - 1 => self.cur_history_loc = Some(i + 1),
    _ => ()
    Some(i) if i < self.context.history.len() - 1 => {
    self.cur_history_loc = Some(i + 1)
    }
    _ => (),
    }
    }
    self.move_cursor_to_end_of_line()
    ......@@ -798,7 +819,7 @@ impl<'a, W: Write> Editor<'a, W> {
    match autosuggestion {
    Some(ref x) if search => buf.copy_buffer(x),
    Some(ref x) => buf.insert_from_buffer(x),
    None => ()
    None => (),
    }
    }
    }
    ......@@ -836,15 +857,24 @@ impl<'a, W: Write> Editor<'a, W> {
    if self.is_search() {
    // If we are searching override prompt to search prompt.
    let (hplace, color) = if self.history_subset_index.len() > 0 {
    (self.history_subset_loc.unwrap_or(0) + 1, color::Green.fg_str())
    (
    self.history_subset_loc.unwrap_or(0) + 1,
    color::Green.fg_str(),
    )
    } else {
    (0, color::Red.fg_str())
    };
    (format!("(search)'{}{}{}` ({}/{}): ",
    color, self.current_buffer(), color::Reset.fg_str(),
    hplace,
    self.history_subset_index.len()),
    9)
    (
    format!(
    "(search)'{}{}{}` ({}/{}): ",
    color,
    self.current_buffer(),
    color::Reset.fg_str(),
    hplace,
    self.history_subset_index.len()
    ),
    9,
    )
    } else {
    (self.prompt.clone(), 0)
    }
    ......@@ -852,7 +882,11 @@ impl<'a, W: Write> Editor<'a, W> {
    fn _display(&mut self, show_autosuggest: bool) -> io::Result<()> {
    BUFFER.with(|output_buf| {
    fn calc_width(prompt_width: usize, buf_widths: &[usize], terminal_width: usize) -> usize {
    fn calc_width(
    prompt_width: usize,
    buf_widths: &[usize],
    terminal_width: usize,
    ) -> usize {
    let mut total = 0;
    for line in buf_widths {
    ......@@ -891,14 +925,12 @@ impl<'a, W: Write> Editor<'a, W> {
    };
    // Width of the current buffer lines (including autosuggestion) from the start to the cursor
    let buf_widths_to_cursor = match self.autosuggestion {
    Some(ref suggestion) =>
    // Cursor might overrun autosuggestion with history search.
    if self.cursor < suggestion.num_chars() {
    suggestion.range_width(0, self.cursor)
    } else {
    buf.range_width(0, self.cursor)
    },
    None => buf.range_width(0, self.cursor)
    Some(ref suggestion) if self.cursor < suggestion.num_chars() =>
    // Cursor might overrun autosuggestion with history search.
    {
    suggestion.range_width(0, self.cursor)
    }
    _ => buf.range_width(0, self.cursor),
    };
    // Total number of terminal spaces taken up by prompt and buffer
    ......@@ -911,16 +943,19 @@ impl<'a, W: Write> Editor<'a, W> {
    let new_num_lines = (new_total_width + terminal_width) / terminal_width;
    output_buf.append(b"\x1B[?1049l\x1B[?1000l\x1B[?1l");
    // Move the term cursor to the same line as the prompt.
    if self.term_cursor_line > 1 {
    output_buf.append(cursor::Up(self.term_cursor_line as u16 - 1).to_string().as_bytes());
    output_buf.append(
    cursor::Up(self.term_cursor_line as u16 - 1)
    .to_string()
    .as_bytes(),
    );
    }
    if ! self.no_newline {
    if !self.no_newline {
    output_buf.append("⏎".as_bytes());
    for _ in 0..(terminal_width - 1) {
    output_buf.push(b' ');
    }
    }
    output_buf.push(b'\r');
    ......@@ -934,7 +969,7 @@ impl<'a, W: Write> Editor<'a, W> {
    }
    // Write the prompt
    if ! self.no_newline {
    if !self.no_newline {
    for line in prompt.split('\n') {
    output_buf.append(line.as_bytes());
    output_buf.append(b"\r\n");
    ......@@ -949,13 +984,9 @@ impl<'a, W: Write> Editor<'a, W> {
    // We get the number of bytes in the buffer (but NOT the autosuggestion).
    // Then, we loop and subtract from that number until it's 0, in which case we are printing
    // the autosuggestion from here on (in a different color).
    let lines = if show_autosuggest {
    match self.autosuggestion {
    Some(ref suggestion) => suggestion.lines(),
    None => buf.lines(),
    }
    } else {
    buf.lines()
    let lines = match self.autosuggestion {
    Some(ref suggestion) if show_autosuggest => suggestion.lines(),
    _ => buf.lines(),
    };
    let mut buf_num_remaining_bytes = buf.num_bytes();
    ......@@ -1021,12 +1052,17 @@ impl<'a, W: Write> Editor<'a, W> {
    // Now that we are on the right line, we must move the term cursor left or right
    // to match the true cursor.
    let cursor_col_diff = new_total_width as isize - new_total_width_to_cursor as isize -
    cursor_line_diff * terminal_width as isize;
    let cursor_col_diff = new_total_width as isize
    - new_total_width_to_cursor as isize
    - cursor_line_diff * terminal_width as isize;
    if cursor_col_diff > 0 {
    output_buf.append(cursor::Left(cursor_col_diff as u16).to_string().as_bytes());
    } else if cursor_col_diff < 0 {
    output_buf.append(cursor::Right((-cursor_col_diff) as u16).to_string().as_bytes());
    output_buf.append(
    cursor::Right((-cursor_col_diff) as u16)
    .to_string()
    .as_bytes(),
    );
    }
    self.term_cursor_line += completion_lines;
    ......@@ -1057,7 +1093,8 @@ impl<'a, W: Write> From<Editor<'a, W>> for String {
    match ed.cur_history_loc {
    Some(i) => ed.context.history[i].clone(),
    _ => ed.new_buf,
    }.into()
    }
    .into()
    }
    }
    ......
    src/util.rs
    View file @ 95122a41
    use std::{
    borrow::Cow,
    io
    };
    use std::{borrow::Cow, io};
    use unicode_width::*;
    pub fn last_prompt_line_width<S: AsRef<str>>(s: S) -> usize {
    ......@@ -70,13 +67,13 @@ pub fn remove_codes(input: &str) -> Cow<str> {
    _ => s = AnsiState::Norm,
    },
    AnsiState::Csi => match c {
    'A' ... 'Z' | 'a' ... 'z' => s = AnsiState::Norm,
    'A'...'Z' | 'a'...'z' => s = AnsiState::Norm,
    _ => (),
    },
    AnsiState::Osc => match c {
    '\x07' => s = AnsiState::Norm,
    _ => (),
    }
    },
    }
    }
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment