fix: 🐛 tab indent is not used in inline directive

shufo · Aug 7, 2022 · b212293 · b212293
1 parent 6211924
commit b212293
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4284,4 +4284,57 @@ describe('formatter', () => {
 
     await util.doubleFormatCheck(content, expected, { sortHtmlAttributes: 'idiomatic' });
   });
+
+  test('it should use tab for indent inside inline directive', async () => {
+    const content = [
+      `<div>`,
+      `    <div>`,
+      `        <div @class([`,
+      `            'some class',`,
+      `            'some other class',`,
+      `            'another class',`,
+      `            'some class',`,
+      `            'some other class',`,
+      `            'another class',`,
+      `        ])></div>`,
+      `    </div>`,
+      `</div>`,
+    ].join('\n');
+
+    const expected = [
+      `<div>`,
+      `	<div>`,
+      `		<div @class([`,
+      `			'some class',`,
+      `			'some other class',`,
+      `			'another class',`,
+      `			'some class',`,
+      `			'some other class',`,
+      `			'another class',`,
+      `		])></div>`,
+      `	</div>`,
+      `</div>`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected, { useTabs: true, indentSize: 1 });
+
+    const expected2 = [
+      `<div>`,
+      `		<div>`,
+      `				<div @class([`,
+      `						'some class',`,
+      `						'some other class',`,
+      `						'another class',`,
+      `						'some class',`,
+      `						'some other class',`,
+      `						'another class',`,
+      `				])></div>`,
+      `		</div>`,
+      `</div>`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected2, { useTabs: true, indentSize: 2 });
+  });
 });
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -1583,12 +1583,16 @@ export default class Formatter {
                   wrapLength = this.wrapLineLength - `func`.length - p1.length - indent.amount;
                 }
 
-                const inside = util
+                let inside = util
                   .formatRawStringAsPhp(`func(${p4})`, wrapLength, true)
                   .replace(/([\n\s]*)->([\n\s]*)/gs, '->')
                   .replace(/,(\s*?\))/gis, (_match5, p5) => p5)
                   .trim();
 
+                if (this.options.useTabs || false) {
+                  inside = _.replace(inside, new RegExp(`(?<=^ *)    `, 'gm'), '\t'.repeat(this.indentSize));
+                }
+
                 if (this.isInline(inside)) {
                   return `${this.indentRawPhpBlock(indent, `${inside}`)
                     .replace(/func\((.*)\)/gis, (match: string, p5: string) => p5)