filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed command mode trigger

Browse Source
This commit is contained in:
filipriec
2025-02-27 11:23:14 +01:00
parent 6fd46de89f
commit 8698b64957
2 changed files with 138 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
client/src/modes/handlers/edit.rs
View File

@@ -21,151 +21,129 @@ pub async fn handle_edit_event(
current_position: &mut u64, current_position: &mut u64,
total_count: u64, total_count: u64,
) -> Result<(bool, String), Box<dyn std::error::Error>> { ) -> Result<(bool, String), Box<dyn std::error::Error>> {
if *command_mode { match key.code {
// Delegate to the command mode handler KeyCode::Left => {
let (should_exit, message, exit_command_mode) = handle_command_event( form_state.current_cursor_pos = form_state.current_cursor_pos.saturating_sub(1);
key, *ideal_cursor_column = form_state.current_cursor_pos;
config, return Ok((false, "".to_string()));
form_state,
command_input,
command_message,
app_terminal,
is_saved,
current_position,
total_count,
).await?;
if exit_command_mode {
*command_mode = false;
} }
KeyCode::Right => {
if !message.is_empty() { let current_input = form_state.get_current_input();
return Ok((should_exit, message)); if form_state.current_cursor_pos < current_input.len() {
} form_state.current_cursor_pos += 1;
} else {
match key.code {
KeyCode::Left => {
form_state.current_cursor_pos = form_state.current_cursor_pos.saturating_sub(1);
*ideal_cursor_column = form_state.current_cursor_pos; *ideal_cursor_column = form_state.current_cursor_pos;
return Ok((false, "".to_string()));
} }
KeyCode::Right => { return Ok((false, "".to_string()));
let current_input = form_state.get_current_input(); }
if form_state.current_cursor_pos < current_input.len() { KeyCode::Char(':') => {
form_state.current_cursor_pos += 1; *command_mode = true;
*ideal_cursor_column = form_state.current_cursor_pos; command_input.clear();
} command_message.clear();
return Ok((false, "".to_string())); return Ok((false, "".to_string()));
} }
KeyCode::Char(':') => { KeyCode::Esc => {
*command_mode = true; if config.is_exit_edit_mode(key.code, key.modifiers) {
command_input.clear(); if form_state.has_unsaved_changes {
command_message.clear(); *command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
}
KeyCode::Esc => {
if config.is_exit_edit_mode(key.code, key.modifiers) {
if form_state.has_unsaved_changes {
*command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
return Ok((false, command_message.clone()));
}
*is_edit_mode = false;
*edit_mode_cooldown = true;
*command_message = "Read-only mode".to_string();
let current_input = form_state.get_current_input();
if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
form_state.current_cursor_pos = current_input.len() - 1;
*ideal_cursor_column = form_state.current_cursor_pos;
}
return Ok((false, command_message.clone())); return Ok((false, command_message.clone()));
} }
} *is_edit_mode = false;
KeyCode::Down => { *edit_mode_cooldown = true;
form_state.current_field = (form_state.current_field + 1) % form_state.fields.len(); *command_message = "Read-only mode".to_string();
let current_input = form_state.get_current_input(); let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len(); if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos); form_state.current_cursor_pos = current_input.len() - 1;
*ideal_cursor_column = form_state.current_cursor_pos;
}
return Ok((false, command_message.clone()));
} }
KeyCode::Up => { }
KeyCode::Down => {
form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Up => {
if form_state.current_field == 0 {
form_state.current_field = form_state.fields.len() - 1;
} else {
form_state.current_field = form_state.current_field.saturating_sub(1);
}
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Tab => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
if form_state.current_field == 0 { if form_state.current_field == 0 {
form_state.current_field = form_state.fields.len() - 1; form_state.current_field = form_state.fields.len() - 1;
} else { } else {
form_state.current_field = form_state.current_field.saturating_sub(1); form_state.current_field = form_state.current_field.saturating_sub(1);
} }
let current_input = form_state.get_current_input(); } else {
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Tab => {
if key.modifiers.contains(KeyModifiers::SHIFT) {
if form_state.current_field == 0 {
form_state.current_field = form_state.fields.len() - 1;
} else {
form_state.current_field = form_state.current_field.saturating_sub(1);
}
} else {
form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
}
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::BackTab => {
if form_state.current_field == 0 {
form_state.current_field = form_state.fields.len() - 1;
} else {
form_state.current_field = form_state.current_field.saturating_sub(1);
}
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Enter => {
form_state.current_field = (form_state.current_field + 1) % form_state.fields.len(); form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
} }
KeyCode::Char(c) => { let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::BackTab => {
if form_state.current_field == 0 {
form_state.current_field = form_state.fields.len() - 1;
} else {
form_state.current_field = form_state.current_field.saturating_sub(1);
}
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Enter => {
form_state.current_field = (form_state.current_field + 1) % form_state.fields.len();
let current_input = form_state.get_current_input();
let max_cursor_pos = current_input.len();
form_state.current_cursor_pos = (*ideal_cursor_column).min(max_cursor_pos);
}
KeyCode::Char(c) => {
let cursor_pos = form_state.current_cursor_pos;
let field_value = form_state.get_current_input_mut();
let mut chars: Vec<char> = field_value.chars().collect();
if cursor_pos <= chars.len() {
chars.insert(cursor_pos, c);
*field_value = chars.into_iter().collect();
form_state.current_cursor_pos = cursor_pos + 1;
*ideal_cursor_column = form_state.current_cursor_pos;
form_state.has_unsaved_changes = true;
}
}
KeyCode::Backspace => {
if form_state.current_cursor_pos > 0 {
let cursor_pos = form_state.current_cursor_pos; let cursor_pos = form_state.current_cursor_pos;
let field_value = form_state.get_current_input_mut(); let field_value = form_state.get_current_input_mut();
let mut chars: Vec<char> = field_value.chars().collect(); let mut chars: Vec<char> = field_value.chars().collect();
if cursor_pos <= chars.len() { if cursor_pos <= chars.len() && cursor_pos > 0 {
chars.insert(cursor_pos, c); chars.remove(cursor_pos - 1);
*field_value = chars.into_iter().collect(); *field_value = chars.into_iter().collect();
form_state.current_cursor_pos = cursor_pos + 1; form_state.current_cursor_pos = cursor_pos - 1;
*ideal_cursor_column = form_state.current_cursor_pos; *ideal_cursor_column = form_state.current_cursor_pos;
form_state.has_unsaved_changes = true; form_state.has_unsaved_changes = true;
} }
} }
KeyCode::Backspace => {
if form_state.current_cursor_pos > 0 {
let cursor_pos = form_state.current_cursor_pos;
let field_value = form_state.get_current_input_mut();
let mut chars: Vec<char> = field_value.chars().collect();
if cursor_pos <= chars.len() && cursor_pos > 0 {
chars.remove(cursor_pos - 1);
*field_value = chars.into_iter().collect();
form_state.current_cursor_pos = cursor_pos - 1;
*ideal_cursor_column = form_state.current_cursor_pos;
form_state.has_unsaved_changes = true;
}
}
}
KeyCode::Delete => {
let cursor_pos = form_state.current_cursor_pos;
let field_value = form_state.get_current_input_mut();
let chars: Vec<char> = field_value.chars().collect();
if cursor_pos < chars.len() {
let mut new_chars = chars.clone();
new_chars.remove(cursor_pos);
*field_value = new_chars.into_iter().collect();
form_state.has_unsaved_changes = true;
}
}
_ => {}
} }
KeyCode::Delete => {
let cursor_pos = form_state.current_cursor_pos;
let field_value = form_state.get_current_input_mut();
let chars: Vec<char> = field_value.chars().collect();
if cursor_pos < chars.len() {
let mut new_chars = chars.clone();
new_chars.remove(cursor_pos);
*field_value = new_chars.into_iter().collect();
form_state.has_unsaved_changes = true;
}
}
_ => {}
} }
*edit_mode_cooldown = false; *edit_mode_cooldown = false;

44
client/src/modes/handlers/event.rs
View File

@@ -6,6 +6,7 @@ use crate::tui::terminal::AppTerminal;
use crate::config::config::Config; use crate::config::config::Config;
use crate::ui::handlers::form::FormState; use crate::ui::handlers::form::FormState;
use crate::modes::handlers::edit::handle_edit_event; use crate::modes::handlers::edit::handle_edit_event;
use crate::modes::handlers::command_mode::handle_command_event;
pub struct EventHandler { pub struct EventHandler {
pub command_mode: bool, pub command_mode: bool,
@@ -46,6 +47,42 @@ impl EventHandler {
current_position: &mut u64, current_position: &mut u64,
) -> Result<(bool, String), Box<dyn std::error::Error>> { ) -> Result<(bool, String), Box<dyn std::error::Error>> {
if let Event::Key(key) = event { if let Event::Key(key) = event {
// Handle command mode first, regardless of the current editing mode
if self.command_mode {
let (should_exit, message, exit_command_mode) = handle_command_event(
key,
config,
form_state,
&mut self.command_input,
&mut self.command_message,
app_terminal,
is_saved,
current_position,
total_count,
).await?;
if exit_command_mode {
self.command_mode = false;
}
if !message.is_empty() {
return Ok((should_exit, message));
}
// If we're still in command mode, don't process other keys
if self.command_mode {
return Ok((false, "".to_string()));
}
}
// Handle special case: Entering command mode with ":"
else if key.code == KeyCode::Char(':') {
self.command_mode = true;
self.command_input.clear();
self.command_message.clear();
return Ok((false, "".to_string()));
}
// Handle mode transitions
if !self.is_edit_mode && config.is_enter_edit_mode(key.code, key.modifiers) { if !self.is_edit_mode && config.is_enter_edit_mode(key.code, key.modifiers) {
// Determine which type of edit mode we're entering // Determine which type of edit mode we're entering
if config.is_enter_edit_mode_after(key.code, key.modifiers) { if config.is_enter_edit_mode_after(key.code, key.modifiers) {
@@ -317,13 +354,8 @@ impl EventHandler {
_ => {} _ => {}
} }
} }
// Handle other keys (e.g., command mode) // Handle other keys in read-only mode
match key.code { match key.code {
KeyCode::Char(':') => {
self.command_mode = true;
self.command_input.clear();
self.command_message.clear();
}
KeyCode::Esc => { KeyCode::Esc => {
self.command_mode = false; self.command_mode = false;
self.command_input.clear(); self.command_input.clear();