fix(ast-engine): correct TAB indentation detection and re-indentation behavior

crates/ast-engine/src/replacer/indent.rs

@@ -84,7 +84,8 @@
 //!
 //! ## Limitations
 //!
-//! - Only supports space-based indentation (tabs not fully supported)
+//! - Handles both space-based and tab-based indentation; mixed indentation
+//!   (spaces and tabs on the same line) falls back to space-based re-indentation
 //! - Assumes well-formed input indentation
 //! - Performance overhead for large code blocks
 //! - Complex algorithm with edge cases
@@ -120,13 +121,13 @@ pub enum DeindentedExtract<'a, C: Content> {
 
     /// Multi-line content with original indentation level recorded.
     ///
-    /// Contains the content bytes and the number of spaces that were used
-    /// for indentation in the original context. The first line's indentation
-    /// is not included in the content.
+    /// Contains the content bytes and the number of whitespace characters
+    /// (spaces or tabs) used for indentation in the original context. The first
+    /// line's indentation is not included in the content.
     ///
     /// # Fields
     /// - Content bytes with relative indentation preserved
-    /// - Original indentation level (number of spaces)
+    /// - Original indentation level (number of whitespace characters)
     MultiLine(&'a [C::Underlying], usize),
 }
 
@@ -251,32 +252,40 @@ pub fn get_indent_at_offset<C: Content>(src: &[C::Underlying]) -> usize {
     get_indent_at_offset_with_tab::<C>(src).0
 }
 
-/// returns (indent, `is_tab`)
+/// Returns `(indent_count, is_tab)` for the current line's leading whitespace.
+///
+/// `is_tab` is `true` only when the entire indentation prefix consists of tab
+/// characters. For mixed indentation (e.g. `" \t"`) `is_tab` is `false` so that
+/// re-indentation falls back to space-based expansion rather than silently
+/// replacing the prefix with all tabs.
 pub fn get_indent_at_offset_with_tab<C: Content>(src: &[C::Underlying]) -> (usize, bool) {
     let lookahead = src.len().max(MAX_LOOK_AHEAD) - MAX_LOOK_AHEAD;
 
     let mut indent = 0;
-    let mut is_tab = false;
+    let mut has_tab = false;
+    let mut has_space = false;
     let new_line = get_new_line::<C>();
     let space = get_space::<C>();
     let tab = get_tab::<C>();
     for c in src[lookahead..].iter().rev() {
         if *c == new_line {
-            return (indent, is_tab);
+            return (indent, has_tab && !has_space);
         }
         if *c == space {
             indent += 1;
+            has_space = true;
         } else if *c == tab {
             indent += 1;
-            is_tab = true;
+            has_tab = true;
         } else {
             indent = 0;
-            is_tab = false;
+            has_tab = false;
+            has_space = false;
         }
     }
     // lookahead == 0 means we have indentation at first line.
     if lookahead == 0 && indent != 0 {
-        (indent, is_tab)
+        (indent, has_tab && !has_space)
     } else {
         (0, false)
     }
@@ -316,19 +325,15 @@ mod test {
     fn test_deindent(source: &str, expected: &str, offset: usize) {
         let source = source.to_string();
         let expected = expected.trim();
-        let start = source[offset..]
-            .chars()
-            .take_while(|n| n.is_whitespace())
-            .count()
-            + offset;
-        let trailing_white = source
-            .chars()
-            .rev()
-            .take_while(|n| n.is_whitespace())
-            .count();
-        let end = source.chars().count() - trailing_white;
+        // Derive byte indices rather than character counts so that the slice
+        // operations (`extract_with_deindent`, `get_indent_at_offset_with_tab`)
+        // work correctly for non-ASCII / multi-byte UTF-8 input as well.
+        let leading_ws_bytes = source[offset..].len() - source[offset..].trim_start().len();
+        let start = offset + leading_ws_bytes;
+        let end = source.trim_end().len();
         let extracted = extract_with_deindent(&source, start..end);
-        let result_bytes = indent_lines::<String>(0, &extracted, source.contains('\t'));
+        let (_, is_tab) = get_indent_at_offset_with_tab::<String>(&source.as_bytes()[..start]);
+        let result_bytes = indent_lines::<String>(0, &extracted, is_tab);
         let actual = std::str::from_utf8(&result_bytes).unwrap();
         assert_eq!(actual, expected);
     }

crates/ast-engine/src/replacer/template.rs

@@ -116,7 +116,7 @@ fn replace_fixer<D: Doc>(fixer: &TemplateFix, env: &MetaVarEnv<'_, D>) -> Underl
         ret.extend_from_slice(&D::Source::decode_str(frag));
     }
     for ((var, indent, is_tab), frag) in vars.zip(frags) {
-        if let Some(bytes) = maybe_get_var(env, var, indent.to_owned(), is_tab.to_owned()) {
+        if let Some(bytes) = maybe_get_var(env, var, *indent, *is_tab) {
             ret.extend_from_slice(&bytes);
         }
         ret.extend_from_slice(&D::Source::decode_str(frag));