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

its now using enum fully for the highlight mode

Browse Source
This commit is contained in:
filipriec
2025-04-16 00:11:41 +02:00
parent af4567aa3d
commit b6c4d3308d
11 changed files with 103 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ use crate::tui::{
};
use crate::state::{
app::{
highlight::HighlightState,
state::AppState,
buffer::{AppView, BufferState},
},
@@ -53,9 +54,7 @@ pub struct EventHandler {
pub command_input: String,
pub command_message: String,
pub is_edit_mode: bool,
pub is_highlight_mode: bool,
pub is_linewise_highlight: bool,
pub highlight_anchor: Option<(usize, usize)>,
pub highlight_state: HighlightState,
pub edit_mode_cooldown: bool,
pub ideal_cursor_column: usize,
pub key_sequence_tracker: KeySequenceTracker,
@@ -69,9 +68,7 @@ impl EventHandler {
command_input: String::new(),
command_message: String::new(),
is_edit_mode: false,
is_highlight_mode: false,
is_linewise_highlight: false,
highlight_anchor: None,
highlight_state: HighlightState::Off,
edit_mode_cooldown: false,
ideal_cursor_column: 0,
key_sequence_tracker: KeySequenceTracker::new(800),
@@ -220,29 +217,27 @@ impl EventHandler {
AppMode::ReadOnly => {
// Check for Linewise highlight first
if config.get_read_only_action_for_key(key_code, modifiers) == Some("enter_highlight_mode_linewise")
&& ModeManager::can_enter_highlight_mode(current_mode) {
self.is_highlight_mode = true;
self.is_linewise_highlight = true; // Set linewise flag
&& ModeManager::can_enter_highlight_mode(current_mode)
{
let current_field_index = if app_state.ui.show_login { login_state.current_field() }
else if app_state.ui.show_register { register_state.current_field() }
else { form_state.current_field() };
// For linewise, anchor char doesn't matter, use 0
self.highlight_anchor = Some((current_field_index, 0));
self.highlight_state = HighlightState::Linewise { anchor_line: current_field_index };
self.command_message = "-- LINE HIGHLIGHT --".to_string();
return Ok(EventOutcome::Ok(self.command_message.clone()));
}
// Check for Character-wise highlight
else if config.get_read_only_action_for_key(key_code, modifiers) == Some("enter_highlight_mode")
&& ModeManager::can_enter_highlight_mode(current_mode) {
self.is_highlight_mode = true;
self.is_linewise_highlight = false; // Ensure linewise is false
&& ModeManager::can_enter_highlight_mode(current_mode)
{
let current_field_index = if app_state.ui.show_login { login_state.current_field() }
else if app_state.ui.show_register { register_state.current_field() }
else { form_state.current_field() };
let current_cursor_pos = if app_state.ui.show_login { login_state.current_cursor_pos() }
else if app_state.ui.show_register { register_state.current_cursor_pos() }
else { form_state.current_cursor_pos() };
self.highlight_anchor = Some((current_field_index, current_cursor_pos));
let anchor = (current_field_index, current_cursor_pos);
self.highlight_state = HighlightState::Characterwise { anchor };
self.command_message = "-- HIGHLIGHT --".to_string();
return Ok(EventOutcome::Ok(self.command_message.clone()));
}
@@ -337,9 +332,7 @@ impl EventHandler {
AppMode::Highlight => {
if config.get_highlight_action_for_key(key_code, modifiers) == Some("exit_highlight_mode") {
self.is_highlight_mode = false;
self.highlight_anchor = None;
self.command_message = "Exited highlight mode".to_string();
self.highlight_state = HighlightState::Off;
terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
return Ok(EventOutcome::Ok(self.command_message.clone()));
}

3
client/src/modes/handlers/mode_manager.rs
View File

@@ -1,6 +1,7 @@
// src/modes/handlers/mode_manager.rs
use crate::state::app::state::AppState;
use crate::modes::handlers::event::EventHandler;
use crate::state::app::highlight::HighlightState;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum AppMode {
@@ -20,7 +21,7 @@ impl ModeManager {
return AppMode::Command;
}
if event_handler.is_highlight_mode {
if !matches!(event_handler.highlight_state, HighlightState::Off) {
return AppMode::Highlight;
}