Luau: fix indentation of leading token in union/intersection when hanging

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed regression where configuration present in current working directory not used when formatting from stdin and no `--stdin-filepath` is provided ([#928](https://github.com/JohnnyMorganz/StyLua/issues/928))
+- Luau: fixed incorrect indentation for leading token in union / intersection when hanging ([#932](https://github.com/JohnnyMorganz/StyLua/issues/932))
 
 ## [2.0.1] - 2024-11-18
 

src/formatters/luau.rs

@@ -841,8 +841,15 @@ fn hang_type_info(
                 is_first = false;
             }
 
-            // TODO: handle leading
-            TypeInfo::Union(TypeUnion::new(union.leading().cloned(), types))
+            // TODO: leading should play a role in the shape computation
+            // TODO(#910): we should decide whether we add or remove a leading token (maybe if hang_level = 0?)
+
+            TypeInfo::Union(TypeUnion::new(
+                union
+                    .leading()
+                    .map(|token| fmt_symbol!(ctx, token, "| ", shape)),
+                types,
+            ))
         }
 
         TypeInfo::Intersection(intersection) => {
@@ -884,9 +891,13 @@ fn hang_type_info(
                 is_first = false;
             }
 
-            // TODO: handle leading
+            // TODO: leading should play a role in the shape computation
+            // TODO(#910): we should decide whether we add or remove a leading token (maybe if hang_level = 0?)
+
             TypeInfo::Intersection(TypeIntersection::new(
-                intersection.leading().cloned(),
+                intersection
+                    .leading()
+                    .map(|token| fmt_symbol!(ctx, token, "& ", shape)),
                 types,
             ))
         }

tests/inputs-luau/type-hanging-leading-token-1.lua

@@ -0,0 +1,9 @@
+export type Foo =
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+export type Foo =
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

tests/snapshots/tests__luau@type-hanging-leading-token-1.lua.snap

@@ -0,0 +1,15 @@
+---
+source: tests/tests.rs
+expression: "format(&contents, LuaVersion::Luau)"
+input_file: tests/inputs-luau/type-hanging-leading-token-1.lua
+---
+export type Foo =
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	| numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+export type Foo =
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	& numberaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+