fix(formatter): correct indentation for flattened binary chains with trailing comments

closes #634

Signed-off-by: azjezz <[email protected]>

Author: azjezz

crates/formatter/src/internal/format/binaryish.rs

@@ -171,9 +171,7 @@ pub(super) fn print_binaryish_expression<'arena>(
         return Document::Group(Group::new(parts));
     }
 
-    let first_group_index = parts.iter().position(|part| matches!(part, Document::Group(_)));
-
-    let split_index = first_group_index.unwrap_or(0);
+    let split_index = 1.min(parts.len());
     let mut head_parts = parts;
     let tail_parts = head_parts.split_off(split_index);
 

crates/formatter/tests/cases/issue_634/after.php

@@ -0,0 +1,8 @@
+<?php
+
+function x(): iterable
+{
+    yield 'INSERT IGNORE INTO `table1` (`col1`, `col2`, `col3`)'
+        . ' SELECT `col1`, `col2`, `col3` FROM table2' // comment 1
+        . ' WHERE `col4` = "val1"'; // comment 2
+}

crates/formatter/tests/cases/issue_634/before.php

@@ -0,0 +1,8 @@
+<?php
+
+function x(): iterable
+{
+    yield 'INSERT IGNORE INTO `table1` (`col1`, `col2`, `col3`)'
+    . ' SELECT `col1`, `col2`, `col3` FROM table2' // comment 1
+        . ' WHERE `col4` = "val1"'; // comment 2
+}

crates/formatter/tests/cases/issue_634/settings.inc

@@ -0,0 +1 @@
+FormatSettings::default()

crates/formatter/tests/mod.rs

@@ -240,6 +240,7 @@ test_case!(issue_536);
 test_case!(issue_556);
 test_case!(issue_602);
 test_case!(issue_683);
+test_case!(issue_634);
 
 #[test]
 fn test_all_test_cases_are_ran() {