From 2cb434f85dfbfe94d41b2a3951a1cae75d3c6fb3 Mon Sep 17 00:00:00 2001
From: Zhai Can <bczhc0@126.com>
Date: Wed, 18 Sep 2024 22:57:09 +0800
Subject: [PATCH] fix: handle zsh's escaped history

---
 src/history.rs | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/history.rs b/src/history.rs
index 0b907d5..09b049f 100644
--- a/src/history.rs
+++ b/src/history.rs
@@ -6,7 +6,7 @@ use std::{
     str::FromStr,
 };
 
-#[derive(Debug, Clone, strum::Display, strum::EnumString)]
+#[derive(Debug, Clone, strum::Display, strum::EnumString, Eq, PartialEq)]
 pub enum HistoryProvider {
     #[strum(serialize = "zsh")]
     Zsh,
@@ -74,6 +74,31 @@ impl Iterator for History {
     type Item = String;
 
     fn next(&mut self) -> Option<Self::Item> {
+        /// Remove metadata from Zsh's escaped history for non-ASCII.
+        ///
+        /// Reference code: https://www.zsh.org/mla/users/2011/msg00154.html
+        ///
+        /// Note: this will mutate `line` in-place.
+        fn zsh_unmetafy(line: &mut [u8]) -> usize {
+            const ZSH_META: u8 = 0x83;
+
+            let Some(mut p) = line.iter().position(|&x| x == ZSH_META) else {
+                return line.len();
+            };
+            let mut t = p;
+            while p < line.len() {
+                line[t] = line[p];
+                p += 1;
+
+                if line[t] == ZSH_META {
+                    line[t] = line[p] ^ 32;
+                    p += 1;
+                }
+                t += 1;
+            }
+            t
+        }
+
         match self.provider {
             HistoryProvider::Zsh | HistoryProvider::Atuin | HistoryProvider::Fish => {
                 let mut block = String::new();
@@ -83,7 +108,13 @@ impl Iterator for History {
                     if buf.is_empty() {
                         return if block.is_empty() { None } else { Some(block) };
                     }
-                    let str = String::from_utf8_lossy(&buf).trim_end().to_owned();
+                    let str_bytes = if self.provider == HistoryProvider::Zsh {
+                        let len = zsh_unmetafy(&mut buf);
+                        &buf[..len]
+                    } else {
+                        &buf
+                    };
+                    let str = String::from_utf8_lossy(str_bytes).trim_end().to_owned();
                     block += &str;
                     if str.is_empty() {
                         buf.clear();