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 c816de4693845cdd10d538931a97425c1d8d8738 Author: Josh Tynjala <[email protected]> AuthorDate: Wed Oct 6 10:55:48 2021 -0700 formatter: unary - with return --- .../java/org/apache/royale/formatter/FORMATTER.java | 2 +- .../org/apache/royale/formatter/TestIdentifier.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java index 50a076d..e7dd6ea 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java @@ -1356,7 +1356,7 @@ class FORMATTER { return (token instanceof ASToken) ? ((ASToken) token).isOperator() || token.getType() == ASTokenTypes.TOKEN_SQUARE_OPEN || token.getType() == ASTokenTypes.TOKEN_PAREN_OPEN || token.getType() == ASTokenTypes.TOKEN_BLOCK_OPEN || token.getType() == ASTokenTypes.TOKEN_SEMICOLON - : (token == null); + || token.getType() == ASTokenTypes.TOKEN_KEYWORD_RETURN : (token == null); } private int increaseIndent(int indent) { diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java b/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java index 2f00d8a..7dd43d9 100644 --- a/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java +++ b/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java @@ -183,6 +183,23 @@ public class TestIdentifier extends BaseFormatterTests { } @Test + public void testUnaryMinusWithReturn() { + FORMATTER formatter = new FORMATTER(); + formatter.insertSpaceBeforeAndAfterBinaryOperators = true; + String result = formatter.formatText( + // @formatter:off + "return -identifier;", + // @formatter:on + problems + ); + assertEquals( + // @formatter:off + "return -identifier;", + // @formatter:on + result); + } + + @Test public void testNot() { FORMATTER formatter = new FORMATTER(); formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
