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 690d9a8178c5dd8a1c108e1fec46466d6b04a035 Author: Josh Tynjala <[email protected]> AuthorDate: Thu Oct 31 13:33:04 2024 -0700 ASTokenFormatter: ensure else without if is considered control flow, and mark if it is missing optional braces --- .../src/main/java/org/apache/royale/formatter/ASTokenFormatter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 534f77e7a..72829060f 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java +++ b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java @@ -850,7 +850,9 @@ public class ASTokenFormatter extends BaseTokenFormatter { && nextTokenNotComment.getType() == ASTokenTypes.TOKEN_KEYWORD_IF) { requiredSpace = true; } else { - blockStack.add(new BlockStackItem(token)); + BlockStackItem stackItem = new BlockStackItem(token); + stackItem.controlFlow = true; + blockStack.add(stackItem); blockOpenPending = true; if (nextToken != null && nextToken.getType() == ASTokenTypes.TOKEN_SEMICOLON) { blockStack.remove(blockStack.size() - 1); @@ -862,6 +864,7 @@ public class ASTokenFormatter extends BaseTokenFormatter { && !skipWhitespaceBeforeSemicolon) { indent = increaseIndent(indent); numRequiredNewLines = Math.max(numRequiredNewLines, 1); + stackItem.braces = false; } } break;
