Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/tui/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -639,9 +639,9 @@ impl App<'_> {
},
CancelEditRequestUrl(_) => match self.url_text_input.is_in_default_mode() {
true => self.select_request_state(),
false => self.url_text_input.key_event(key, None),
false => self.url_text_input.key_event(key, Some(terminal)),
},
KeyEventEditRequestUrl(_) => self.url_text_input.key_event(key, None),
KeyEventEditRequestUrl(_) => self.url_text_input.key_event(key, Some(terminal)),

/* Query params */

Expand Down Expand Up @@ -852,13 +852,13 @@ impl App<'_> {

ModifyRequestPostRequestScript(_) => match self.script_console.post_request_text_area.is_in_default_mode() {
true => self.tui_modify_post_request_script(),
false => self.script_console.post_request_text_area.key_event(key, None),
false => self.script_console.post_request_text_area.key_event(key, Some(terminal)),
},
CancelEditRequestPostRequestScript(_) => match self.script_console.post_request_text_area.is_in_default_mode() {
true => self.select_request_state(),
false => self.script_console.post_request_text_area.key_event(key, None),
false => self.script_console.post_request_text_area.key_event(key, Some(terminal)),
},
KeyEventEditRequestPostRequestScript(_) => self.script_console.post_request_text_area.key_event(key, None),
KeyEventEditRequestPostRequestScript(_) => self.script_console.post_request_text_area.key_event(key, Some(terminal)),

/* Settings */

Expand Down
22 changes: 14 additions & 8 deletions src/tui/utils/stateful/text_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use edtui::actions::motion::MoveToFirstRow;
use edtui::actions::search::StartSearch;
use edtui::actions::{Composed, CopySelection, DeleteChar, FindNext, FindPrevious, InsertChar, LineBreak, MoveBackward, MoveDown, MoveForward, MoveToEndOfLine, MoveToStartOfLine, MoveUp, MoveWordBackward, MoveWordForward, OpenSystemEditor, Paste, Redo, RemoveChar, RemoveCharFromSearch, SelectCurrentSearch, StopSearch, SwitchMode, Undo};
use edtui::events::{KeyEventHandler, KeyEventRegister, KeyInput};
use edtui::{system_editor, EditorEventHandler, EditorMode, EditorState, EditorStatusLine, EditorTheme, EditorView, LineNumbers, SyntaxHighlighter};
use edtui::{system_editor, EditorEventHandler, EditorMode, EditorState, EditorStatusLine, EditorTheme, EditorView, LineNumbers, Lines, SyntaxHighlighter};
use ratatui::backend::CrosstermBackend;
use ratatui::buffer::Buffer;
use ratatui::crossterm::event::{KeyCode, KeyEvent};
Expand Down Expand Up @@ -297,6 +297,17 @@ impl TextInput {

if let Some(terminal) = terminal && system_editor::is_pending(&self.state) {
system_editor::open(&mut self.state, terminal).ok();

if self.is_single_line {
// TODO: contact edtui developer to come up with methods for this case
// use only first line after editing
let row = self.state.lines.first_row().unwrap();
let row = row.into_iter().collect::<String>();

self.state.lines.clear();
self.state.lines = Lines::from(row);
}

}
}
}
Expand All @@ -312,10 +323,8 @@ fn generate_key_handler(is_single_line: bool, insert_mode_only: bool) -> KeyEven
handler.remove(&KeyEventRegister::i(vec![KeyInput::new(KeyCode::Enter)]));
handler.remove(&KeyEventRegister::n(vec![KeyInput::new(KeyCode::Char('o'))]));
handler.remove(&KeyEventRegister::n(vec![KeyInput::new(KeyCode::Char('O'))]));
handler.remove(&KeyEventRegister::n(vec![KeyInput::new(KeyCode::Char('j'))]));
handler.remove(&KeyEventRegister::n(vec![KeyInput::new(KeyCode::Char('J'))]));

// External system editor
handler.remove(&KeyEventRegister::n(vec![KeyInput::ctrl(KeyCode::Char('e'))]));
}

if insert_mode_only {
Expand All @@ -332,9 +341,6 @@ fn generate_key_handler(is_single_line: bool, insert_mode_only: bool) -> KeyEven
handler.remove(&KeyEventRegister::i(vec![KeyInput::ctrl(KeyCode::Char('o'))]));
handler.remove(&KeyEventRegister::i(vec![KeyInput::new(KeyCode::Enter)]));
handler.remove(&KeyEventRegister::i(vec![KeyInput::ctrl(KeyCode::Char('j'))]));

// External system editor
handler.remove(&KeyEventRegister::i(vec![KeyInput::alt(KeyCode::Char('e'))]))
}

if insert_mode_only {
Expand Down Expand Up @@ -444,4 +450,4 @@ fn get_color_from_mode(mode: &EditorMode) -> Color {
EditorMode::Visual => Color::Yellow,
EditorMode::Search => Color::Magenta
}
}
}
Loading