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 2023/09/18 21:39:46 UTC

[royale-compiler] 01/02: ASTokenFormatter: && should be || when checking for comments

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 529ff70cf85603224bfcf2c34cf175af16dccbb1
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Sep 18 09:43:14 2023 -0700

    ASTokenFormatter: && should be || when checking for comments
---
 .../main/java/org/apache/royale/formatter/ASTokenFormatter.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 4fad031fc..701f919eb 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java
@@ -1038,8 +1038,8 @@ public class ASTokenFormatter extends BaseTokenFormatter {
 				continue;
 			}
 			if (skipComments && (token.getType() == ASTokenTypes.HIDDEN_TOKEN_SINGLE_LINE_COMMENT
-					&& token.getType() == ASTokenTypes.HIDDEN_TOKEN_MULTI_LINE_COMMENT
-					&& token.getType() == ASTokenTypes.TOKEN_ASDOC_COMMENT)) {
+					|| token.getType() == ASTokenTypes.HIDDEN_TOKEN_MULTI_LINE_COMMENT
+					|| token.getType() == ASTokenTypes.TOKEN_ASDOC_COMMENT)) {
 				continue;
 			}
 			if (current == offset) {
@@ -1058,8 +1058,8 @@ public class ASTokenFormatter extends BaseTokenFormatter {
 				continue;
 			}
 			if (skipComments && (token.getType() == ASTokenTypes.HIDDEN_TOKEN_SINGLE_LINE_COMMENT
-					&& token.getType() == ASTokenTypes.HIDDEN_TOKEN_MULTI_LINE_COMMENT
-					&& token.getType() == ASTokenTypes.TOKEN_ASDOC_COMMENT)) {
+					|| token.getType() == ASTokenTypes.HIDDEN_TOKEN_MULTI_LINE_COMMENT
+					|| token.getType() == ASTokenTypes.TOKEN_ASDOC_COMMENT)) {
 				continue;
 			}
 			if (current == offset) {