Fix collapsing when comment present in complex expr (#538)

* Add test case

* If expression contains comments, then use hanging version

* Snapshot

* changelog

Author: JohnnyMorganz

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed macOS aarch64 target in release workflow ([#528](https://github.com/JohnnyMorganz/StyLua/issues/528))
 - Long union/interesection types inside of a parentheses will now cause the parentheses to expand multiline ([#531](https://github.com/JohnnyMorganz/StyLua/issues/531))
 - Fixed leading comments lost from an expression when excessive parentheses are removed from it ([#530](https://github.com/JohnnyMorganz/StyLua/issues/530))
+- Fixed comments present in a complex expression not forcing multiline hanging leading to a syntax error ([#524](https://github.com/JohnnyMorganz/StyLua/issues/524))
 
 ## [0.14.2] - 2022-07-27
 

src/formatters/expression.rs

@@ -1038,24 +1038,36 @@ fn hang_binop_expression(
                             hang_binop_expression(
                                 ctx,
                                 *lhs,
-                                if same_op_level { top_binop } else { binop },
+                                if same_op_level {
+                                    top_binop
+                                } else {
+                                    binop.clone()
+                                },
                                 lhs_shape,
                                 lhs_range,
                             ),
-                            format_expression_internal(
-                                ctx,
-                                &rhs,
-                                ExpressionContext::UnaryOrBinary,
-                                rhs_shape,
-                            ),
+                            if contains_comments(&*rhs) {
+                                hang_binop_expression(ctx, *rhs, binop, shape, lhs_range)
+                            } else {
+                                format_expression_internal(
+                                    ctx,
+                                    &rhs,
+                                    ExpressionContext::UnaryOrBinary,
+                                    rhs_shape,
+                                )
+                            },
                         ),
                         ExpressionSide::Right => (
-                            format_expression_internal(
-                                ctx,
-                                &lhs,
-                                ExpressionContext::UnaryOrBinary,
-                                lhs_shape,
-                            ),
+                            if contains_comments(&*lhs) {
+                                hang_binop_expression(ctx, *lhs, binop.clone(), shape, lhs_range)
+                            } else {
+                                format_expression_internal(
+                                    ctx,
+                                    &lhs,
+                                    ExpressionContext::UnaryOrBinary,
+                                    lhs_shape,
+                                )
+                            },
                             hang_binop_expression(
                                 ctx,
                                 *rhs,

tests/inputs/multiline-expression-comments-1.lua

@@ -0,0 +1,15 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/524
+if ( object == "linebreak" or	--Force a new line
+	type(object) == "table" and	--Make sure this is an actual object before checking further.
+	((container.flowMaxPerLine and currentPrimaryLine > container.flowMaxPerLine) or	--We went past the max number of columns
+		currentSecondaryOffset + object["Get"..primaryDirection](object) > container["Get"..primaryDirection](container)) ) then	--We went past the max pixel width.
+end
+
+if ( name and
+	((not strictFiltering) and
+		( tokenTable[subgroup] or tokenTable[className] or (role and tokenTable[role]) or tokenTable[assignedRole] ) -- non-strict filtering
+	) or
+		( tokenTable[subgroup] and tokenTable[className] and ((role and tokenTable[role]) or tokenTable[assignedRole]) ) -- strict filtering
+) then
+
+end

tests/snapshots/tests__standard@multiline-expression-comments-1.lua.snap

@@ -0,0 +1,31 @@
+---
+source: tests/tests.rs
+expression: format(&contents)
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/524
+if
+	object == "linebreak" --Force a new line
+	or type(object) == "table" --Make sure this is an actual object before checking further.
+		and (
+			(container.flowMaxPerLine and currentPrimaryLine > container.flowMaxPerLine) --We went past the max number of columns
+			or currentSecondaryOffset + object["Get" .. primaryDirection](object)
+				> container["Get" .. primaryDirection](container)
+		)
+then --We went past the max pixel width.
+end
+
+if
+	name
+		and (
+			not strictFiltering
+			and (
+				tokenTable[subgroup]
+				or tokenTable[className]
+				or (role and tokenTable[role])
+				or tokenTable[assignedRole]
+			) -- non-strict filtering
+		)
+	or (tokenTable[subgroup] and tokenTable[className] and ((role and tokenTable[role]) or tokenTable[assignedRole])) -- strict filtering
+then
+end
+