Merge pull request #887 from shufo/fix/inline-php-directive

shufo · Nov 5, 2023 · da2e0fc · da2e0fc
2 parents 9e1e075 + 2010b5d
commit da2e0fc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/__tests__/fixtures/snapshots/inline_php_directive.snapshot b/__tests__/fixtures/snapshots/inline_php_directive.snapshot
@@ -0,0 +1,18 @@
+------------------------------------options----------------------------------------
+{}
+------------------------------------content----------------------------------------
+<div @php($counter = 1)>
+     <x-share>
+          @if ($counter)
+          {{--  --}}
+    @endif
+  </x-share>
+</div>
+------------------------------------expected----------------------------------------
+<div @php($counter = 1)>
+    <x-share>
+        @if ($counter)
+            {{--  --}}
+        @endif
+    </x-share>
+</div>
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -194,8 +194,8 @@ export default class Formatter {
       .then((target) => this.preserveRawBladeBrace(target))
       .then((target) => this.preserveConditions(target))
       .then((target) => this.preservePropsBlock(target))
-      .then((target) => this.preserveInlineDirective(target))
       .then((target) => this.preserveInlinePhpDirective(target))
+      .then((target) => this.preserveInlineDirective(target))
       .then((target) => this.preserveBladeDirectivesInScripts(target))
       .then((target) => this.preserveBladeDirectivesInStyles(target))
       .then((target) => this.preserveCustomDirective(target))
@@ -231,8 +231,8 @@ export default class Formatter {
       .then((target) => this.restoreCustomDirective(target))
       .then((target) => this.restoreBladeDirectivesInStyles(target))
       .then((target) => this.restoreBladeDirectivesInScripts(target))
-      .then((target) => this.restoreInlinePhpDirective(target))
       .then((target) => this.restoreInlineDirective(target))
+      .then((target) => this.restoreInlinePhpDirective(target))
       .then((target) => this.restoreConditions(target))
       .then((target) => this.restoreRawBladeBrace(target))
       .then((target) => this.restoreBladeBrace(target))