Remove unnecessary else break in if expression comments

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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))
+- Fixed unnecessary break on `else` in an if-expression when the expression contains a comment ([#520](https://github.com/JohnnyMorganz/StyLua/issues/520))
 
 ## [0.14.2] - 2022-07-27
 

src/formatters/expression.rs

@@ -454,7 +454,15 @@ fn format_token_expression_sequence(
             expression.update_trailing_trivia(FormatTriviaType::Replace(vec![])),
         ); // Remove trailing trivia (comments) before checking, as they shouldn't have an impact
 
-    let token = match requires_multiline_expression {
+    let newline_after_token = trivia_util::trivia_contains_comments(
+        token.trailing_trivia(),
+        trivia_util::CommentSearch::Single,
+    ) || trivia_util::trivia_contains_comments(
+        trivia_util::get_expression_leading_trivia(expression).iter(),
+        trivia_util::CommentSearch::Single,
+    );
+
+    let token = match newline_after_token {
         // `<token>\n`
         true => format_token_reference(ctx, token, shape)
             .update_trailing_trivia(FormatTriviaType::Append(vec![create_newline_trivia(ctx)])),
@@ -465,12 +473,15 @@ fn format_token_expression_sequence(
     };
 
     let expression = match requires_multiline_expression {
-        true => {
-            let shape = shape.reset().increment_additional_indent();
-            hang_expression(ctx, expression, shape, None).update_leading_trivia(
-                FormatTriviaType::Append(vec![create_indent_trivia(ctx, shape)]),
-            )
-        }
+        true => match newline_after_token {
+            true => {
+                let shape = shape.reset().increment_additional_indent();
+                hang_expression(ctx, expression, shape, None).update_leading_trivia(
+                    FormatTriviaType::Append(vec![create_indent_trivia(ctx, shape)]),
+                )
+            }
+            false => hang_expression(ctx, expression, shape, None),
+        },
         false => formatted_expression,
     };
 

tests/inputs-luau/if-expression-comments-3.lua

@@ -0,0 +1,12 @@
+-- https://github.com/JohnnyMorganz/StyLua/issues/520
+do
+	return if #timings <= workers
+		then max
+		else math.max(Array.reduce(timings, function(
+			-- food
+			sum,
+			time_
+		)
+			return sum + time_
+		end) / workers, max)
+end

tests/snapshots/tests__luau@if-expression-comments-3.lua.snap

@@ -0,0 +1,17 @@
+---
+source: tests/tests.rs
+expression: format(&contents)
+---
+-- https://github.com/JohnnyMorganz/StyLua/issues/520
+do
+	return if #timings <= workers
+		then max
+		else math.max(Array.reduce(timings, function(
+			-- food
+			sum,
+			time_
+		)
+			return sum + time_
+		end) / workers, max)
+end
+