fix: 🐛 syntax error on chained method

✅ Closes: #686
shufo · Aug 13, 2022 · 22b5f49 · 22b5f49
1 parent 8df6b32
commit 22b5f49
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4392,4 +4392,21 @@ describe('formatter', () => {
 
     await util.doubleFormatCheck(content, expected2, { useTabs: true, indentSize: 2 });
   });
+
+  test('unless directive with arrowed method', async () => {
+    const content = [
+      `@unless  (auth()->user()->hasVerifiedEmail())`,
+      `  <p>Please check and verify your email to access the system</p>`,
+      `@endunless`,
+    ].join('\n');
+
+    const expected = [
+      `@unless(auth()->user()->hasVerifiedEmail())`,
+      `    <p>Please check and verify your email to access the system</p>`,
+      `@endunless`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected, { sortHtmlAttributes: 'idiomatic' });
+  });
 });
diff --git a/src/util.ts b/src/util.ts
@@ -135,6 +135,7 @@ export async function prettifyPhpContentWithUnescapedTags(content: any) {
             (match2: any, j1: any, j2: any, j3: any) => `@${j1.trim()}${j2}(${j3.trim()})`,
           )
           .replace(/([\n\s]*)->([\n\s]*)/gs, '->')
+          .replace(/,\)$/, ')')
           .replace(/(?:\n\s*)* as(?= (?:&{0,1}\$[\w]+|list|\[\$[\w]+))/g, ' as'),
       ),
     )