handle double-indent followed by double-outdent

rokucommunity · Apr 2, 2024 · d053541 · d053541
1 parent b634f67
commit d053541
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/src/Formatter.spec.ts b/src/Formatter.spec.ts
@@ -251,6 +251,24 @@ describe('Formatter', () => {
                 end sub
            `);
         });
+
+        it('formats outdents', () => {
+            expect(formatter.format(undent`
+                temp = {
+                    key_9: { env: ["any"], themes: ["any"], runtimeCheck: function() as boolean
+                            return true
+                    end function }
+                }
+            `, {
+                formatMultiLineObjectsAndArrays: false
+            })).to.equal(undent`
+                temp = {
+                    key_9: { env: ["any"], themes: ["any"], runtimeCheck: function() as boolean
+                        return true
+                    end function }
+                }
+            `);
+        });
     });
 
     describe('formatMultiLineObjectsAndArrays', () => {

diff --git a/src/formatters/IndentFormatter.ts b/src/formatters/IndentFormatter.ts
@@ -59,6 +59,7 @@ export class IndentFormatter {
         let currentLineOffset = 0;
         let nextLineOffset = 0;
         let foundIndentorThisLine = false;
+        let foundUnIndentOnThisLine = false;
 
         for (let i = 0; i < lineTokens.length; i++) {
             let token = lineTokens[i];
@@ -90,6 +91,17 @@ export class IndentFormatter {
                     continue;
                 }
 
+                //skip indent for 'function'|'sub' used as type if another indent already exist in this line
+                if (
+                    CallableKeywordTokenKinds.includes(token.kind) &&
+                    //validate if its a function/sub call
+                    nextNonWhitespaceToken.kind === TokenKind.LeftParen &&
+                    foundIndentorThisLine
+                ) {
+                    parentIndentTokenKinds.push(token.kind);
+                    continue;
+                }
+
                 //skip indent for single-line if statements
                 let ifStatement = ifStatements.get(token);
                 const endIfToken = this.getEndIfToken(ifStatement);
@@ -151,6 +163,17 @@ export class IndentFormatter {
                 }
 
                 nextLineOffset--;
+
+                if (
+                    [TokenKind.RightCurlyBrace].includes(token.kind) &&
+                    //if the line has already been unindented
+                    (foundUnIndentOnThisLine)
+                ) {
+                    continue;
+                }
+
+                foundUnIndentOnThisLine = true;
+
                 if (foundIndentorThisLine === false) {
                     currentLineOffset--;
                 }