fix: 🐛 json directive is not indented when it is multi-line

shufo · Sep 24, 2022 · 3933eb4 · 3933eb4
1 parent 30840c3
commit 3933eb4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4592,4 +4592,31 @@ describe('formatter', () => {
 
     await util.doubleFormatCheck(content, expected);
   });
+
+  test('inline @json directive', async () => {
+    const content = [
+      `@section('footer')`,
+      `    <script>`,
+      `        Object.assign(lang, @json([`,
+      `            'name' => __('name'),`,
+      `            'current' => __('current'),`,
+      `        ]));`,
+      `    </script>`,
+      `@endsection`,
+    ].join('\n');
+
+    const expected = [
+      `@section('footer')`,
+      `    <script>`,
+      `        Object.assign(lang, @json([`,
+      `            'name' => __('name'),`,
+      `            'current' => __('current'),`,
+      `        ]));`,
+      `    </script>`,
+      `@endsection`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected);
+  });
 });
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -29,6 +29,7 @@ import {
   indentStartTokensWithoutPrefix,
   unbalancedStartTokens,
   cssAtRuleTokens,
+  inlinePhpDirectives,
 } from './indent';
 import { nestedParenthesisRegex } from './regex';
 import { SortHtmlAttributes } from './runtimeConfig';
@@ -1600,10 +1601,13 @@ export default class Formatter {
               .trimRight('\n')}`;
           }
 
-          if (/(@button|@class|@include|@disabled|@checked)/gi.test(matched)) {
+          if (new RegExp(inlinePhpDirectives.join('|'), 'gi').test(matched)) {
             const formatted = _.replace(
               matched,
-              /(?<=@(button|class|include|disabled|checked).*?\()(.*)(?=\))/gis,
+              new RegExp(
+                `(?<=@(${_.map(inlinePhpDirectives, (token) => token.substring(1)).join('|')}).*?\\()(.*)(?=\\))`,
+                'gis',
+              ),
               (match2: any, p3: any, p4: any) => {
                 let wrapLength = this.wrapLineLength;
 

diff --git a/src/indent.ts b/src/indent.ts
@@ -116,6 +116,8 @@ export const phpKeywordStartTokens = ['@forelse', '@if', '@for', '@foreach', '@w
 
 export const phpKeywordEndTokens = ['@endforelse', '@endif', '@endforeach', '@endfor', '@endwhile', '@break'];
 
+export const inlinePhpDirectives = ['@button', '@class', '@include', '@disabled', '@checked', '@json'];
+
 export const inlineFunctionTokens = [
   '@set',
   '@json',