fix some table align

Author: CppCXY

crates/emmylua_formatter/src/formatter/expr.rs

@@ -1990,29 +1990,35 @@ fn field_requests_alignment(field: &LuaTableField) -> bool {
         return false;
     }
 
-    let Some(value) = field.get_value_expr() else {
-        return false;
-    };
     let Some(assign_token) = field.syntax().children_with_tokens().find_map(|element| {
         let token = element.into_token()?;
         (token.kind() == LuaTokenKind::TkAssign.into()).then_some(token)
     }) else {
         return false;
     };
 
-    let field_start = field.syntax().text_range().start();
-    let gap_start = usize::from(assign_token.text_range().end() - field_start);
-    let gap_end = usize::from(value.syntax().text_range().start() - field_start);
-    if gap_end <= gap_start {
-        return false;
-    }
+    let mut gap_width = 0usize;
+    let mut previous = assign_token.prev_token();
 
-    let text = field.syntax().text().to_string();
-    let Some(gap) = text.get(gap_start..gap_end) else {
-        return false;
-    };
+    while let Some(token) = previous {
+        match token.kind().to_token() {
+            LuaTokenKind::TkWhitespace => {
+                for ch in token.text().chars().rev() {
+                    if matches!(ch, '\n' | '\r') {
+                        return false;
+                    }
+                    if matches!(ch, ' ' | '\t') {
+                        gap_width += 1;
+                    }
+                }
+                previous = token.prev_token();
+            }
+            LuaTokenKind::TkEndOfLine => return false,
+            _ => break,
+        }
+    }
 
-    !gap.contains(['\n', '\r']) && gap.chars().filter(|ch| matches!(ch, ' ' | '\t')).count() > 1
+    gap_width > 1
 }
 
 fn table_group_requests_alignment(entries: &[TableEntry]) -> bool {

crates/emmylua_formatter/src/test/comment_tests.rs

@@ -649,7 +649,7 @@ local zzz = 3
             r#"
 local t = {
     x = 1,
-    long_name =  2,
+    long_name  = 2,
     yy = 3,
 }
 "#,
@@ -681,7 +681,7 @@ local t = {
         };
 
         assert_format_with_config!(
-            r#"local t = { x = 1, long_name =  2, yy = 3 }
+            r#"local t = { x = 1, long_name  = 2, yy = 3 }
 "#,
             r#"
 local t = {
@@ -694,6 +694,40 @@ local t = {
         );
     }
 
+    #[test]
+    fn test_table_field_extra_space_after_equal_does_not_trigger_alignment() {
+        use crate::{
+            assert_format_with_config,
+            config::{LayoutConfig, LuaFormatConfig},
+        };
+
+        let config = LuaFormatConfig {
+            layout: LayoutConfig {
+                table_expand: crate::config::ExpandStrategy::Always,
+                ..Default::default()
+            },
+            ..Default::default()
+        };
+
+        assert_format_with_config!(
+            r#"
+local t = {
+    x = 1,
+    long_name =  2,
+    yy = 3,
+}
+"#,
+            r#"
+local t = {
+    x = 1,
+    long_name = 2,
+    yy = 3
+}
+"#,
+            config
+        );
+    }
+
     #[test]
     fn test_alignment_disabled() {
         use crate::{assert_format_with_config, config::LuaFormatConfig};
@@ -808,7 +842,7 @@ end
             r#"
 local t = {
     x = 100, -- first
-    long_name =  2, -- second
+    long_name  = 2, -- second
 }
 "#,
             r#"
@@ -840,7 +874,7 @@ local t = {
             r#"
 local t = {
     a = "very very long",  -- first
-    b =  2, -- second
+    b  = 2, -- second
     c = 3,
     d = 4,  -- third
     e = 5 -- fourth