fix: 🐛 nested switch directive gets unexpected format

shufo · Feb 20, 2022 · 865cadf · 865cadf
1 parent 97b4595
commit 865cadf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/formatter.ts b/src/formatter.ts
@@ -316,11 +316,16 @@ export default class Formatter {
         content,
         new RegExp(`(\\s*?)(${directive})(\\s*?)${nestedParenthesisRegex}(\\s*)`, 'gmi'),
         (match) => {
-          return `${match.trim()}\n`;
+          return `\n${match.trim()}\n`;
         },
       );
     });
 
+    // eslint-disable-next-line
+    content = _.replace(content, /@case\S*?\s*?@case/gim, (match) => {
+      return `${match.replace('\n', '')}`;
+    });
+
     const unbalancedEchos = ['@break'];
 
     _.forEach(unbalancedEchos, (directive) => {
@@ -1118,7 +1123,6 @@ export default class Formatter {
       if (token === '@endswitch' && _.last(this.stack) === '@default') {
         this.decrementIndentLevel(2);
         this.shouldBeIndent = false;
-        this.stack.pop();
         return;
       }