fix: 🐛 support case insensitive directive

shufo · Aug 4, 2020 · fbb3a6d · fbb3a6d
1 parent 31cc1af
commit fbb3a6d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 5 deletions.
diff --git a/__tests__/formatter.test.js b/__tests__/formatter.test.js
@@ -245,6 +245,44 @@ describe('formatter', () => {
       });
   });
 
+  test('directive token should case insensitive', () => {
+    const content = [
+      `<div>`,
+      `@Section('foo')`,
+      `@section('bar')`,
+      `@if($user)`,
+      `{{ $user->name }}`,
+      `@foreach($users as $user)`,
+      `{{ $user->id }}`,
+      `@endForeach`,
+      `@endIf`,
+      `@endSection`,
+      `</div>`,
+      ``,
+    ].join('\n');
+
+    const expected = [
+      `<div>`,
+      `    @Section('foo')`,
+      `    @section('bar')`,
+      `        @if ($user)`,
+      `            {{ $user->name }}`,
+      `            @foreach ($users as $user)`,
+      `                {{ $user->id }}`,
+      `            @endForeach`,
+      `        @endIf`,
+      `    @endSection`,
+      `</div>`,
+      ``,
+    ].join('\n');
+
+    return formatter()
+      .formatContent(content)
+      .then(function (result) {
+        assert.equal(result, expected);
+      });
+  });
+
   test('multiple section directive test', function () {
     const content = [
       `<div>`,

diff --git a/src/formatter.js b/src/formatter.js
@@ -98,7 +98,7 @@ export default class Formatter {
     }
 
     if (_.includes(phpKeywordEndTokens, token)) {
-      if (_.last(this.stack) !== '@hasSection') {
+      if (_.last(this.stack) !== '@hassection') {
         this.stack.pop();
         return;
       }
@@ -164,7 +164,7 @@ export default class Formatter {
       return;
     }
 
-    this.processKeyword(token);
+    this.processKeyword(token.toLowerCase());
   }
 
   processTokenizeResult(tokenizeLineResult, originalLine) {

diff --git a/src/indent.js b/src/indent.js
@@ -11,7 +11,7 @@ export const indentStartTokens = [
   '@foreach',
   '@forelse',
   '@guest',
-  '@hasSection',
+  '@hassection',
   '@if',
   '@isset',
   '@permission',

diff --git a/src/util.js b/src/util.js
@@ -214,14 +214,14 @@ export function preserveDirectives(content) {
         `(${phpKeywordStartTokens.join(
           '|',
         )})([\\s]*?)\\(((?:[^)(]+|\\((?:[^)(]+|\\([^)(]*\\))*\\))*)\\)`,
-        'gs',
+        'gis',
       );
       return _.replace(res, regex, (match, p1, p2, p3) => {
         return `<beautify start="${p1}${p2}" exp="^^^${p3}^^^">`;
       });
     })
     .then((res) => {
-      const regex = new RegExp(`(${phpKeywordEndTokens.join('|')})`, 'gs');
+      const regex = new RegExp(`(${phpKeywordEndTokens.join('|')})`, 'gis');
       return _.replace(res, regex, (match, p1) => {
         return `</beautify end="${p1}">`;
       });