fix: fix the issue of inaccurate automatic column width adjustment via PR #8 from fuhan666/bugfix/col-width

fuhan666 · web-flow · commit a1e11637d8b4 · 2025-04-30T15:23:20.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["command-line-utilities", "development-tools", "data-structures",
 exclude = ["/.github", "CHANGELOG.md", ".gitignore"]
 
 [dependencies]
-ratatui = "0.29.0"
+ratatui = "0.24.0"
 crossterm = "0.27.0"
 calamine = "0.22.1"
 anyhow = "1.0.79"
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 chrono = "0.4"
 indexmap = { version = "2.0", features = ["serde"] }
-tui-textarea = "0.7.0"
+tui-textarea = "0.4.0"
 
 [profile.release]
 opt-level = 3
diff --git a/src/app/edit.rs b/src/app/edit.rs
@@ -3,6 +3,7 @@ use crate::app::AppState;
 use crate::app::InputMode;
 use crate::app::{Transition, VimMode, VimState};
 use anyhow::Result;
+use ratatui::style::{Modifier, Style};
 use tui_textarea::Input;
 
 impl AppState<'_> {
@@ -11,10 +12,14 @@ impl AppState<'_> {
         let content = self.get_cell_content(self.selected_cell.0, self.selected_cell.1);
         self.input_buffer = content.clone();
 
-        self.text_area = tui_textarea::TextArea::default();
-        self.text_area.insert_str(&content);
-        self.text_area.set_tab_length(4);
+        // Initialize TextArea with content and settings
+        let mut text_area = tui_textarea::TextArea::default();
+        text_area.insert_str(&content);
+        text_area.set_tab_length(4);
+        text_area.set_cursor_line_style(Style::default());
+        text_area.set_cursor_style(Style::default().add_modifier(Modifier::REVERSED));
 
+        self.text_area = text_area;
         self.vim_state = Some(VimState::new(VimMode::Normal));
     }
 
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -6,6 +6,7 @@ mod state;
 mod ui;
 mod undo_manager;
 mod vim;
+mod word;
 
 pub use state::*;
 pub use vim::*;
diff --git a/src/app/search.rs b/src/app/search.rs
@@ -1,19 +1,32 @@
 use crate::app::AppState;
 use crate::app::InputMode;
+use ratatui::style::{Modifier, Style};
 
 impl AppState<'_> {
     pub fn start_search_forward(&mut self) {
         self.input_mode = InputMode::SearchForward;
         self.input_buffer = String::new();
-        self.text_area = tui_textarea::TextArea::default();
+
+        // Initialize TextArea
+        let mut text_area = tui_textarea::TextArea::default();
+        text_area.set_cursor_line_style(Style::default());
+        text_area.set_cursor_style(Style::default().add_modifier(Modifier::REVERSED));
+        self.text_area = text_area;
+
         self.add_notification("Search forward mode".to_string());
         self.highlight_enabled = true;
     }
 
     pub fn start_search_backward(&mut self) {
         self.input_mode = InputMode::SearchBackward;
         self.input_buffer = String::new();
-        self.text_area = tui_textarea::TextArea::default();
+
+        // Initialize TextArea
+        let mut text_area = tui_textarea::TextArea::default();
+        text_area.set_cursor_line_style(Style::default());
+        text_area.set_cursor_style(Style::default().add_modifier(Modifier::REVERSED));
+        self.text_area = text_area;
+
         self.add_notification("Search backward mode".to_string());
         self.highlight_enabled = true;
     }
diff --git a/src/app/sheet.rs b/src/app/sheet.rs
@@ -611,8 +611,7 @@ impl AppState<'_> {
 
             max_width = max_width.max(display_width);
         }
-        let padding = (max_width / 5).max(2);
-        max_width + padding
+        max_width
     }
 
     pub fn get_column_width(&self, col: usize) -> usize {
diff --git a/src/app/vim.rs b/src/app/vim.rs
@@ -3,6 +3,8 @@ use ratatui::widgets::Block;
 use std::fmt;
 use tui_textarea::{CursorMove, Input, Key, TextArea};
 
+use crate::app::word::move_cursor_to_word_end;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum VimMode {
     Normal,
@@ -109,9 +111,39 @@ impl VimState {
                         ctrl: false,
                         ..
                     } => {
-                        textarea.move_cursor(CursorMove::WordEnd);
+                        // Use custom WordEnd implementation
+                        let lines = textarea.lines();
+                        let (row, col) = textarea.cursor();
+                        let (new_row, new_col) = move_cursor_to_word_end(lines, row, col);
+
+                        // Set the cursor to the new position
+                        if row != new_row {
+                            // If need to move to a different row
+                            while textarea.cursor().0 < new_row {
+                                textarea.move_cursor(CursorMove::Down);
+                            }
+                            textarea.move_cursor(CursorMove::Head);
+                            while textarea.cursor().1 < new_col {
+                                textarea.move_cursor(CursorMove::Forward);
+                            }
+                        } else {
+                            // If staying on the same row
+                            if col < new_col {
+                                // Move forward
+                                while textarea.cursor().1 < new_col {
+                                    textarea.move_cursor(CursorMove::Forward);
+                                }
+                            } else {
+                                // Move backward
+                                while textarea.cursor().1 > new_col {
+                                    textarea.move_cursor(CursorMove::Back);
+                                }
+                            }
+                        }
+
+                        // For operator mode, include the character under the cursor
                         if matches!(self.mode, VimMode::Operator(_)) {
-                            textarea.move_cursor(CursorMove::Forward); // Include the text under the cursor
+                            textarea.move_cursor(CursorMove::Forward);
                         }
                     }
                     Input {
diff --git a/src/app/word.rs b/src/app/word.rs
@@ -0,0 +1,69 @@
+// Custom implementation of word navigation functions from tui-textarea v0.5.2+
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum CharKind {
+    Space,
+    Punctuation,
+    Other,
+}
+
+impl CharKind {
+    fn new(c: char) -> Self {
+        if c.is_whitespace() {
+            Self::Space
+        } else if c.is_ascii_punctuation() {
+            Self::Punctuation
+        } else {
+            Self::Other
+        }
+    }
+}
+
+/// Find the end of the next word
+/// This is a custom implementation of the `find_word_end_next` function from tui-textarea v0.5.2+
+pub fn find_word_end_next(line: &str, start_col: usize) -> Option<usize> {
+    let mut it = line.chars().enumerate().skip(start_col);
+    let (mut cur_col, cur_char) = it.next()?;
+    let mut cur = CharKind::new(cur_char);
+
+    for (next_col, c) in it {
+        let next = CharKind::new(c);
+        // if cursor started at the end of a word, don't stop
+        if next_col.saturating_sub(start_col) > 1 && cur != CharKind::Space && next != cur {
+            return Some(next_col.saturating_sub(1));
+        }
+        cur = next;
+        cur_col = next_col;
+    }
+
+    // if end of line is whitespace, don't stop the cursor
+    if cur != CharKind::Space && cur_col.saturating_sub(start_col) >= 1 {
+        return Some(cur_col);
+    }
+
+    None
+}
+
+/// Move cursor to the end of the next word
+pub fn move_cursor_to_word_end(text: &[String], row: usize, col: usize) -> (usize, usize) {
+    if row >= text.len() {
+        return (row, col);
+    }
+
+    let line = &text[row];
+
+    if let Some(new_col) = find_word_end_next(line, col) {
+        return (row, new_col);
+    } else if row + 1 < text.len() {
+        // Try to find word end in the next line
+        if let Some(new_col) = find_word_end_next(&text[row + 1], 0) {
+            return (row + 1, new_col);
+        } else if !text[row + 1].is_empty() {
+            // If no word end found but line is not empty, go to the end of the line
+            return (row + 1, text[row + 1].chars().count().saturating_sub(1));
+        }
+    }
+
+    // Can't find a word end, stay at the current position
+    (row, col)
+}
diff --git a/src/ui/render.rs b/src/ui/render.rs

Original file line number	Diff line number	Diff line change
`@@ -611,8 +611,7 @@ impl AppState<'_> {`
`611`	`611`
`612`	`612`	`max_width = max_width.max(display_width);`
`613`	`613`	`}`
`614`		`- let padding = (max_width / 5).max(2);`
`615`		`- max_width + padding`
	`614`	`+ max_width`
`616`	`615`	`}`
`617`	`616`
`618`	`617`	`pub fn get_column_width(&self, col: usize) -> usize {`