openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-15 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Ahmed Ibrahim
2026-01-15 00:02:35 -08:00
parent 8db4cde5f8
commit a4fd6e3420
2 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
codex-rs/tui/src/bottom_pane/chat_composer.rs
View File

@@ -124,11 +124,25 @@ impl SlashPopupContext {
/// Return the prefix used to filter slash commands.
fn popup_prefix(&self) -> &str {
let prefix_end = if self.cursor_on_first_line() {
self.cursor.max(1).min(self.first_line_end)
let mut prefix_end = if self.cursor_on_first_line() {
let cursor = if self.cursor == 0 && self.text.starts_with('/') {
1
} else {
self.cursor
};
cursor.min(self.first_line_end)
} else {
self.first_line_end
};
if prefix_end < self.text.len() && !self.text.is_char_boundary(prefix_end) {
prefix_end = self
.text
.char_indices()
.map(|(i, _)| i)
.take_while(|&i| i <= prefix_end)
.last()
.unwrap_or(0);
}
&self.text[..prefix_end]
}
}
@@ -4535,6 +4549,28 @@ mod tests {
);
}
#[test]
fn slash_popup_ignores_non_ascii_prefix_at_start() {
use tokio::sync::mpsc::unbounded_channel;
let (tx, _rx) = unbounded_channel::<AppEvent>();
let sender = AppEventSender::new(tx);
let mut composer = ChatComposer::new(
true,
sender,
false,
"Ask Codex to do anything".to_string(),
false,
);
composer.set_text_content("あ".to_string());
assert!(
matches!(composer.active_popup, ActivePopup::None),
"non-ASCII prefix should not activate slash popup"
);
}
#[test]
fn slash_popup_activated_for_prefix_with_args() {
let (tx, _rx) = unbounded_channel::<AppEvent>();

40
codex-rs/tui2/src/bottom_pane/chat_composer.rs
View File

@@ -127,11 +127,25 @@ impl SlashPopupContext {
/// Return the prefix used to filter slash commands.
fn popup_prefix(&self) -> &str {
let prefix_end = if self.cursor_on_first_line() {
self.cursor.max(1).min(self.first_line_end)
let mut prefix_end = if self.cursor_on_first_line() {
let cursor = if self.cursor == 0 && self.text.starts_with('/') {
1
} else {
self.cursor
};
cursor.min(self.first_line_end)
} else {
self.first_line_end
};
if prefix_end < self.text.len() && !self.text.is_char_boundary(prefix_end) {
prefix_end = self
.text
.char_indices()
.map(|(i, _)| i)
.take_while(|&i| i <= prefix_end)
.last()
.unwrap_or(0);
}
&self.text[..prefix_end]
}
}
@@ -4393,6 +4407,28 @@ mod tests {
);
}
#[test]
fn slash_popup_ignores_non_ascii_prefix_at_start() {
use tokio::sync::mpsc::unbounded_channel;
let (tx, _rx) = unbounded_channel::<AppEvent>();
let sender = AppEventSender::new(tx);
let mut composer = ChatComposer::new(
true,
sender,
false,
"Ask Codex to do anything".to_string(),
false,
);
composer.set_text_content("あ".to_string());
assert!(
matches!(composer.active_popup, ActivePopup::None),
"non-ASCII prefix should not activate slash popup"
);
}
#[test]
fn slash_popup_activated_for_prefix_with_args() {
use tokio::sync::mpsc::unbounded_channel;