extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-06-20 09:58:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Escape control characters using caret notation (#1585)

Browse Source 
Instead of using their equivalent hex codes.
This commit is contained in:
Peter Holloway 2024-01-18 18:08:55 +00:00 committed by GitHub
parent 1ada866058
commit 8913d46dab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atuin-common/src/utils.rs
View File

@ -1,6 +1,5 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::env; use std::env;
use std::fmt::Write;
use std::path::PathBuf; use std::path::PathBuf;
use rand::RngCore; use rand::RngCore;
@ -119,7 +118,11 @@ pub trait Escapable: AsRef<str> {
while let Some(i) = remaining.find(|c: char| c.is_ascii_control()) { while let Some(i) = remaining.find(|c: char| c.is_ascii_control()) {
// safe to index with `..i`, `i` and `i+1..` as part[i] is a single byte ascii char // safe to index with `..i`, `i` and `i+1..` as part[i] is a single byte ascii char
buf.push_str(&remaining[..i]); buf.push_str(&remaining[..i]);
let _ = write!(&mut buf, "\\x{:02x}", remaining.as_bytes()[i]); buf.push('^');
buf.push(match remaining.as_bytes()[i] {
0x7F => '?',
code => char::from_u32(u32::from(code) + 64).unwrap(),
});
remaining = &remaining[i + 1..]; remaining = &remaining[i + 1..];
} }
buf.push_str(remaining); buf.push_str(remaining);
@ -218,17 +221,17 @@ mod tests {
fn escape_control_characters() { fn escape_control_characters() {
use super::Escapable; use super::Escapable;
// CSI colour sequence // CSI colour sequence
assert_eq!("\x1b[31mfoo".escape_control(), "\\x1b[31mfoo"); assert_eq!("\x1b[31mfoo".escape_control(), "^[[31mfoo");
// Tabs count as control chars // Tabs count as control chars
assert_eq!("foo\tbar".escape_control(), "foo\\x09bar"); assert_eq!("foo\tbar".escape_control(), "foo^Ibar");
// space is in control char range but should be excluded // space is in control char range but should be excluded
assert_eq!("two words".escape_control(), "two words"); assert_eq!("two words".escape_control(), "two words");
// unicode multi-byte characters // unicode multi-byte characters
let s = "🐢\x1b[32m🦀"; let s = "🐢\x1b[32m🦀";
assert_eq!(s.escape_control(), s.replace("\x1b", "\\x1b")); assert_eq!(s.escape_control(), s.replace("\x1b", "^["));
} }
#[test] #[test]