commit 529ff70cf85603224bfcf2c34cf175af16dccbb1
author Josh Tynjala <joshtynjala@apache.org> Mon Sep 18 09:43:14 2023 -0700
committer Josh Tynjala <joshtynjala@apache.org> Mon Sep 18 09:43:14 2023 -0700
tree 0c73a153d8ecd193b54a494f8e78767c38a9e696
parent 6944fdceb6ae3623356edf294a0b79b7926b50d8

ASTokenFormatter: && should be || when checking for comments

formatter/src/main/java/org/apache/royale/formatter/ASTokenFormatter.java

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 4fad031..701f919 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 @@
 				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 @@
 				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) {