This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit b90b5a889a79532f272fc150d520d85cdd58c14a Author: Josh Tynjala <[email protected]> AuthorDate: Wed Jan 8 14:14:49 2025 -0800 formatter: new option indent-switch-contents A similar option existed in Flash Builder, so it makes sense to add it to asformat too --- .../apache/royale/formatter/ASTokenFormatter.java | 42 +++++-- .../apache/royale/formatter/FormatterSettings.java | 1 + .../apache/royale/formatter/FormatterUtils.java | 1 + .../royale/formatter/config/Configuration.java | 18 +++ .../royale/formatter/TestSwitchStatement.java | 132 +++++++++++++++++++++ 5 files changed, 184 insertions(+), 10 deletions(-) diff --git a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java index c3966e01c..4aa6fcb9c 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java +++ b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java @@ -362,15 +362,23 @@ public class ASTokenFormatter extends BaseTokenFormatter { boolean oneLineBlock = prevToken != null && prevToken.getType() == ASTokenTypes.TOKEN_BLOCK_OPEN && !(stackItem instanceof ObjectLiteralBlockStackItem); - boolean packageBlock = stackItem != null && stackItem.token.getType() == ASTokenTypes.TOKEN_KEYWORD_PACKAGE; - boolean skipPackageIndent = packageBlock && !settings.indentPackageContents; - if (!skipPackageIndent && (!settings.collapseEmptyBlocks || !oneLineBlock)) { + boolean allowPackageIndent = settings.indentPackageContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_PACKAGE; + boolean allowSwitchIndent = settings.indentSwitchContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_SWITCH; + if ((!settings.collapseEmptyBlocks || !oneLineBlock) + && allowPackageIndent + && allowSwitchIndent) { indent = decreaseIndent(indent); } if (stackItem.token.getType() == ASTokenTypes.TOKEN_KEYWORD_CASE || stackItem.token.getType() == ASTokenTypes.TOKEN_KEYWORD_DEFAULT) { blockStack.remove(blockStack.size() - 1); - indent = decreaseIndent(indent); + if (settings.indentSwitchContents) { + indent = decreaseIndent(indent); + } skipSwitchDecrease = true; } } @@ -570,9 +578,17 @@ public class ASTokenFormatter extends BaseTokenFormatter { if (blockOpenPending) { boolean oneLineBlock = nextToken != null && nextToken.getType() == ASTokenTypes.TOKEN_BLOCK_CLOSE; - boolean packageBlock = !blockStack.isEmpty() && blockStack.get(blockStack.size() - 1).token.getType() == ASTokenTypes.TOKEN_KEYWORD_PACKAGE; - boolean skipPackageIndent = packageBlock && !settings.indentPackageContents; - if (settings.placeOpenBraceOnNewLine && (!settings.collapseEmptyBlocks || !oneLineBlock) && !skipPackageIndent) { + BlockStackItem stackItem = blockStack.isEmpty() ? null : blockStack.get(blockStack.size() - 1); + boolean allowPackageIndent = settings.indentPackageContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_PACKAGE; + boolean allowSwitchIndent = settings.indentSwitchContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_SWITCH; + if (settings.placeOpenBraceOnNewLine + && (!settings.collapseEmptyBlocks || !oneLineBlock) + && allowPackageIndent + && allowSwitchIndent) { indent = increaseIndent(indent); } } @@ -661,9 +677,15 @@ public class ASTokenFormatter extends BaseTokenFormatter { } boolean oneLineBlock = nextToken != null && nextToken.getType() == ASTokenTypes.TOKEN_BLOCK_CLOSE; - boolean packageBlock = stackItem != null && stackItem.token.getType() == ASTokenTypes.TOKEN_KEYWORD_PACKAGE; - boolean skipPackageIndent = packageBlock && !settings.indentPackageContents; - if (!skipPackageIndent && (!settings.collapseEmptyBlocks || !oneLineBlock)) { + boolean allowPackageIndent = settings.indentPackageContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_PACKAGE; + boolean allowSwitchIndent = settings.indentSwitchContents + || stackItem == null + || stackItem.token.getType() != ASTokenTypes.TOKEN_KEYWORD_SWITCH; + if ((!settings.collapseEmptyBlocks || !oneLineBlock) + && allowPackageIndent + && allowSwitchIndent) { if (!settings.placeOpenBraceOnNewLine) { indent = increaseIndent(indent); } diff --git a/formatter/src/main/java/org/apache/royale/formatter/FormatterSettings.java b/formatter/src/main/java/org/apache/royale/formatter/FormatterSettings.java index de14d18cc..fb4c8c664 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FormatterSettings.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FormatterSettings.java @@ -39,6 +39,7 @@ public class FormatterSettings { public boolean ignoreProblems = false; public boolean collapseEmptyBlocks = false; public boolean indentPackageContents = true; + public boolean indentSwitchContents = true; public boolean mxmlAlignAttributes = false; public boolean mxmlInsertNewLineBetweenAttributes = false; public boolean mxmlIndentCData = true; diff --git a/formatter/src/main/java/org/apache/royale/formatter/FormatterUtils.java b/formatter/src/main/java/org/apache/royale/formatter/FormatterUtils.java index 2aec32da5..4b71b8676 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FormatterUtils.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FormatterUtils.java @@ -42,6 +42,7 @@ public class FormatterUtils { settings.ignoreProblems = configuration.getIgnoreParsingProblems(); settings.collapseEmptyBlocks = configuration.getCollapseEmptyBlocks(); settings.indentPackageContents = configuration.getIndentPackageContents(); + settings.indentSwitchContents = configuration.getIndentSwitchContents(); settings.mxmlAlignAttributes = configuration.getMxmlAlignAttributes(); settings.mxmlInsertNewLineBetweenAttributes = configuration.getMxmlInsertNewLineBetweenAttributes(); settings.mxmlIndentCData = configuration.getMxmlIndentCData(); diff --git a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java index 56f546672..e8f24ede4 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java +++ b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java @@ -500,6 +500,24 @@ public class Configuration { this.indentPackageContents = b; } + // + // 'indent-switch-contents' option + // + + private boolean indentSwitchContents = true; + + public boolean getIndentSwitchContents() + { + return indentSwitchContents; + } + + @Config + @Mapping("indent-switch-contents") + public void setIndentSwitchContents(ConfigurationValue cv, boolean b) + { + this.indentSwitchContents = b; + } + // // 'tab-size' option // diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java index 1db40e90f..4085bdd59 100644 --- a/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java +++ b/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java @@ -30,6 +30,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -53,6 +54,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -77,6 +79,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -100,6 +103,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -122,6 +126,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -144,12 +149,42 @@ public class TestSwitchStatement extends BaseFormatterTests { result); } + @Test + public void testWithCaseClauseAndStatementIndentSwitchContentsDisabled() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceAfterKeywordsInControlFlowStatements = true; + settings.placeOpenBraceOnNewLine = true; + settings.insertSpaces = false; + settings.indentSwitchContents = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "switch (condition)\n" + + "{\n" + + "\tcase condition:\n" + + "\t\tbreak;\n" + + "}", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "switch (condition)\n" + + "{\n" + + "case condition:\n" + + "\tbreak;\n" + + "}", + // @formatter:on + result); + } + @Test public void testWithCaseClauseAndMultipleStatements() { FormatterSettings settings = new FormatterSettings(); settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -180,6 +215,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -210,6 +246,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -238,6 +275,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -270,6 +308,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -300,6 +339,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -337,6 +377,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -374,6 +415,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -402,6 +444,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -432,6 +475,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -462,6 +506,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -490,6 +535,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -522,6 +568,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -552,6 +599,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -589,6 +637,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = false; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -626,6 +675,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -658,6 +708,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -690,6 +741,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -724,6 +776,73 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "{\n" + + "\tswitch (condition)\n" + + "\t{\n" + + "\t}\n" + + "\tstatement;\n" + + "}", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "{\n" + + "\tswitch (condition)\n" + + "\t{\n" + + "\t}\n" + + "\tstatement;\n" + + "}", + // @formatter:on + result); + } + + @Test + public void testNextIndentWithEmptyBlockIndentSwitchContentsDisabled1() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceAfterKeywordsInControlFlowStatements = true; + settings.placeOpenBraceOnNewLine = true; + settings.insertSpaces = false; + settings.indentSwitchContents = false; + ASTokenFormatter formatter = new ASTokenFormatter(settings); + String result = formatter.format("file.as", + // @formatter:off + "{\n" + + "\tswitch (condition)\n" + + "\t{\n" + + "\t\tcase condition:\n" + + "\t\t\tbreak;" + + "\t}\n" + + "\tstatement;\n" + + "}", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "{\n" + + "\tswitch (condition)\n" + + "\t{\n" + + "\tcase condition:\n" + + "\t\tbreak;\n" + + "\t}\n" + + "\tstatement;\n" + + "}", + // @formatter:on + result); + } + + @Test + public void testNextIndentWithEmptyBlockIndentSwitchContentsDisabled2() { + FormatterSettings settings = new FormatterSettings(); + settings.insertSpaceAfterKeywordsInControlFlowStatements = true; + settings.placeOpenBraceOnNewLine = true; + settings.insertSpaces = false; + settings.indentSwitchContents = false; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -754,6 +873,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -788,6 +908,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -824,6 +945,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -862,6 +984,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -896,6 +1019,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -932,6 +1056,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -970,6 +1095,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -998,6 +1124,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", // @formatter:off @@ -1024,6 +1151,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; settings.collapseEmptyBlocks = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", @@ -1046,6 +1174,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; settings.collapseEmptyBlocks = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", @@ -1069,6 +1198,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; settings.collapseEmptyBlocks = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", @@ -1091,6 +1221,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; settings.collapseEmptyBlocks = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as", @@ -1112,6 +1243,7 @@ public class TestSwitchStatement extends BaseFormatterTests { settings.insertSpaceAfterKeywordsInControlFlowStatements = true; settings.placeOpenBraceOnNewLine = true; settings.insertSpaces = false; + settings.indentSwitchContents = true; settings.collapseEmptyBlocks = true; ASTokenFormatter formatter = new ASTokenFormatter(settings); String result = formatter.format("file.as",
