fix: 🐛 nested condition inserts unexpected comma

#491
shufo · Jul 12, 2022 · 92d5023 · 92d5023
1 parent b402a47
commit 92d5023
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4046,4 +4046,51 @@ describe('formatter', () => {
 
     await util.doubleFormatCheck(content, expected);
   });
+
+  test('nested condition', async () => {
+    const content = [
+      `@if (count( auth("     (  )   ")->user()   ->currentXY->shopsXY()) > 1)`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+      `@if (`,
+      ``,
+      ``,
+      `foo(count( auth("     (  )   ")->user()   ->currentXY->shopsXY()) > 1`,
+      ``,
+      ``,
+      `))`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+      `@if (count(auth()->user()->currentXY->shopsXY()) > 1)`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+    ].join('\n');
+
+    const expected = [
+      `@if (count(auth('     (  )   ')->user()->currentXY->shopsXY()) > 1)`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+      `@if (foo(count(auth('     (  )   ')->user()->currentXY->shopsXY()) > 1))`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+      `@if (count(auth()->user()->currentXY->shopsXY()) > 1)`,
+      `    <span class="ml-24">Test</span>`,
+      `@else`,
+      `    <span class="ml-16">Test</span>`,
+      `@endif`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected);
+  });
 });
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -1484,8 +1484,10 @@ export default class Formatter {
         return this.indentComponentAttribute(
           indent.indent,
           util
-            .formatRawStringAsPhp(matched)
+            .formatRawStringAsPhp(matched, this.wrapLineLength, true)
             .replace(/([\n\s]*)->([\n\s]*)/gs, '->')
+            .replace(/(?<!(['"]).*)(?<=\()[\n\s]+?(?=\w)/gms, '')
+            .replace(/,[\n\s]*\)/gs, ')')
             .trimEnd(),
         );
       }),