You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/10/06 18:00:29 UTC
[royale-compiler] 06/07: formatter: unary - after comma
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 c51f2fc5a1f27656341baa3b8904351da285a33d
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Oct 6 10:57:52 2021 -0700
formatter: unary - after comma
---
.../java/org/apache/royale/formatter/FORMATTER.java | 3 ++-
.../org/apache/royale/formatter/TestIdentifier.java | 17 +++++++++++++++++
2 files changed, 19 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 e7dd6ea..6108806 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,8 @@ 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.getType() == ASTokenTypes.TOKEN_KEYWORD_RETURN : (token == null);
+ || token.getType() == ASTokenTypes.TOKEN_KEYWORD_RETURN || token.getType() == ASTokenTypes.TOKEN_COMMA
+ : (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 7dd43d9..94cc797 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java
@@ -200,6 +200,23 @@ public class TestIdentifier extends BaseFormatterTests {
}
@Test
+ public void testUnaryMinusWithComma() {
+ FORMATTER formatter = new FORMATTER();
+ formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
+ String result = formatter.formatText(
+ // @formatter:off
+ "var array = [identifier, -identifier];",
+ // @formatter:on
+ problems
+ );
+ assertEquals(
+ // @formatter:off
+ "var array = [identifier, -identifier];",
+ // @formatter:on
+ result);
+ }
+
+ @Test
public void testNot() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;