Merge pull request #721 from shufo/fix/timeout-on-unclosed-quote

shufo · Sep 24, 2022 · 30840c3 · 30840c3
2 parents 52e6fed + 6aa4e61
commit 30840c3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4573,4 +4573,23 @@ describe('formatter', () => {
 
     await util.doubleFormatCheck(content, expected);
   });
+
+  test('it should not timeout even if there is a quote in php expression', async () => {
+    const content = [
+      `@php`,
+      `// if breadcrumbs aren't defined in the CrudController, use the default breadcrumbs`,
+      `$breadcrumbs = $breadcrumbs ?? $defaultBreadcrumbs;`,
+      `@endphp`,
+    ].join('\n');
+
+    const expected = [
+      `@php`,
+      `// if breadcrumbs aren't defined in the CrudController, use the default breadcrumbs`,
+      `$breadcrumbs = $breadcrumbs ?? $defaultBreadcrumbs;`,
+      `@endphp`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected);
+  });
 });
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -819,7 +819,7 @@ export default class Formatter {
   }
 
   preserveStringLiteralInPhp(content: any) {
-    return _.replace(content, /('(?:[^\\']+|\\.)*'|"(?:[^\\"]+|\\.)*")/g, (match: string) => {
+    return _.replace(content, /(\'([^\\']|\\.)*?\'|\"([^\\']|\\.)*?\")/gm, (match: string) => {
       return `${this.storeStringLiteralInPhp(match)}`;
     });
   }