fix: 🐛 unexpected result when wrap attributes min attrs option

shufo · Jul 23, 2023 · a7480c4 · a7480c4
1 parent 900196d
commit a7480c4
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 3 deletions.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -5140,4 +5140,63 @@ describe('formatter', () => {
       wrapAttributes: 'force-expand-multiline',
     });
   });
+
+  test('script tag with wrapAttributesMinAttrs option', async () => {
+    const content = [
+      `@push('scripts')`,
+      `    <script>`,
+      `        $("#table-kategori").DataTable({});`,
+      `    </script>`,
+      `@endpush`,
+    ].join('\n');
+
+    const expected = [
+      `@push('scripts')`,
+      `    <script>`,
+      `        $("#table-kategori").DataTable({});`,
+      `    </script>`,
+      `@endpush`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected, {
+      wrapAttributesMinAttrs: 0,
+      wrapAttributes: 'force-expand-multiline',
+    });
+  });
+
+  test('nonnative script tag with wrapAttributesMinAttrs option', async () => {
+    const content = [
+      `@push('scripts')`,
+      `    <script type="template">`,
+      `        <div></div>`,
+      `    </script>`,
+      `@endpush`,
+    ].join('\n');
+
+    const expected = [
+      `@push('scripts')`,
+      `    <script type="template">`,
+      `        <div></div>`,
+      `    </script>`,
+      `@endpush`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected, {
+      wrapAttributesMinAttrs: 0,
+      wrapAttributes: 'force-expand-multiline',
+    });
+  });
+
+  test('content sensitive html tag with wrapAttributesMinAttrs option', async () => {
+    const content = [`<textarea>`, `foo`, `</textarea>`, `<pre>`, `bar`, `</pre>`].join('\n');
+
+    const expected = [`<textarea>`, `foo`, `</textarea>`, `<pre>`, `bar`, `</pre>`, ``].join('\n');
+
+    await util.doubleFormatCheck(content, expected, {
+      wrapAttributesMinAttrs: 0,
+      wrapAttributes: 'force-expand-multiline',
+    });
+  });
 });
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -1147,15 +1147,15 @@ export default class Formatter {
   }
 
   getNonnativeScriptPlaceholder(replace: string) {
-    return _.replace('<blade ___non_native_scripts_#___ />', '#', replace);
+    return _.replace('<blade___non_native_scripts_#___ />', '#', replace);
   }
 
   getScriptPlaceholder(replace: any) {
-    return _.replace('<blade ___scripts_#___ />', '#', replace);
+    return _.replace('<blade___scripts_#___ />', '#', replace);
   }
 
   getHtmlTagPlaceholder(replace: string) {
-    return _.replace('<blade ___html_tags_#___ />', '#', replace);
+    return _.replace('<blade___html_tags_#___ />', '#', replace);
   }
 
   getInlineCustomDirectivePlaceholder(replace: string) {

diff --git a/src/util.ts b/src/util.ts
@@ -350,6 +350,9 @@ const escapeTags = [
   '/\\* blade_comment_start \\*/',
   '/\\* blade_comment_end \\*/',
   '/\\*\\*\\*script_placeholder\\*\\*\\*/',
+  'blade___non_native_scripts_',
+  'blade___scripts_',
+  'blade___html_tags_',
   'beautifyTag',
   '@customdirective',
   '@elsecustomdirective',