Skip to content

fix: proper unicode support for input handling #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
64bit merged 1 commit into from
Apr 11, 2026
Merged

fix: proper unicode support for input handling #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ repository = "https://github.com/64bit/commandOK"

[dependencies]
ratatui = "0.30"
unicode-width = "0.2.2"
crossterm = "0.29"
reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] }
reqwest = { version = "0.13", default-features = false, features = [
"json",
"rustls",
] }
tokio = { version = "1", features = ["full"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
Expand Down
80 changes: 62 additions & 18 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,56 @@ impl App {
history: History::load(),
}
}

fn move_cursor_left(&mut self) {
self.cursor = self.cursor.saturating_sub(1);
}

fn move_cursor_right(&mut self) {
if self.cursor < self.input.chars().count() {
self.cursor += 1;
}
}

fn enter_char(&mut self, c: char) {
let idx = self.byte_index();
self.input.insert(idx, c);
self.move_cursor_right();
}

fn byte_index(&self) -> usize {
self.input
.char_indices()
.map(|(i, _)| i)
.nth(self.cursor)
.unwrap_or(self.input.len())
}

fn cursor_visual_width(&self) -> usize {
use unicode_width::UnicodeWidthStr;
let byte_idx = self.byte_index();
UnicodeWidthStr::width(&self.input[..byte_idx])
}

fn delete_char(&mut self) {
if self.cursor != 0 {
let current_index = self.cursor;
let from_left_to_current_index = current_index - 1;
let before_char_to_delete = self.input.chars().take(from_left_to_current_index);
let after_char_to_delete = self.input.chars().skip(current_index);
self.input = before_char_to_delete.chain(after_char_to_delete).collect();
self.move_cursor_left();
}
}

fn delete_forward_char(&mut self) {
if self.cursor < self.input.chars().count() {
let current_index = self.cursor;
let before_char_to_delete = self.input.chars().take(current_index);
let after_char_to_delete = self.input.chars().skip(current_index + 1);
self.input = before_char_to_delete.chain(after_char_to_delete).collect();
}
}
}

// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -197,7 +247,7 @@ fn render(f: &mut Frame, app: &App, provider_label: &str) {
let (color, content, hint, show_cursor) = match &app.mode {
Mode::Input => {
let line = Line::from(vec![
Span::styled("> ", Style::default().fg(Color::Cyan).bold()),
Span::styled("❱ ", Style::default().fg(Color::Cyan).bold()),
Span::raw(&app.input),
]);
(
Expand Down Expand Up @@ -264,7 +314,7 @@ fn render(f: &mut Frame, app: &App, provider_label: &str) {
f.render_widget(Paragraph::new(content).block(block), area);

if show_cursor {
let x = area.x + 1 + 2 + app.cursor as u16;
let x = area.x + 1 + 2 + app.cursor_visual_width() as u16;
f.set_cursor_position((x, area.y + 1));
}
}
Expand Down Expand Up @@ -382,13 +432,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
KeyCode::Up => {
if let Some(prev) = app.history.prev(&app.input) {
app.input = prev.to_string();
app.cursor = app.input.len();
app.cursor = app.input.chars().count();
}
}
KeyCode::Down => {
if let Some(next) = app.history.next() {
app.input = next.to_string();
app.cursor = app.input.len();
app.cursor = app.input.chars().count();
}
}
KeyCode::Char(c) => {
Expand All @@ -398,25 +448,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
app.cursor = 0;
}
} else {
app.input.insert(app.cursor, c);
app.cursor += 1;
app.enter_char(c);
}
}
KeyCode::Backspace => {
if app.cursor > 0 {
app.cursor -= 1;
app.input.remove(app.cursor);
}
}
KeyCode::Delete if app.cursor < app.input.len() => {
app.input.remove(app.cursor);
app.delete_char();
}
KeyCode::Left => app.cursor = app.cursor.saturating_sub(1),
KeyCode::Right if app.cursor < app.input.len() => {
app.cursor += 1;
KeyCode::Delete => {
app.delete_forward_char();
}
KeyCode::Left => app.move_cursor_left(),
KeyCode::Right => app.move_cursor_right(),
KeyCode::Home => app.cursor = 0,
KeyCode::End => app.cursor = app.input.len(),
KeyCode::End => app.cursor = app.input.chars().count(),
_ => {}
},
Mode::Loading | Mode::Streaming(_) => {
Expand All @@ -431,7 +475,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
}
KeyCode::Char('e') => {
app.mode = Mode::Input;
app.cursor = app.input.len();
app.cursor = app.input.chars().count();
app.history.reset_nav();
}
KeyCode::Esc => app.quit = true,
Expand Down