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 149dace067b9bcf7484b8c9be95080d74035db8c
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Nov 15 14:58:43 2021 -0800
formatter: handle space before /> in MXML
---
formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java | 7 +++++--
.../test/java/org/apache/royale/formatter/TestFormatterOff.java | 6 +++---
.../src/test/java/org/apache/royale/formatter/TestMXMLTag.java | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
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 8fda9a1..6a80272 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
@@ -1858,7 +1858,8 @@ public class FORMATTER {
}
case MXMLTokenTypes.TOKEN_CLOSE_TAG_START: {
if (nextToken != null && nextToken.getType() != MXMLTokenTypes.TOKEN_TAG_END
- && nextToken.getType() != MXMLTokenTypes.TOKEN_EMPTY_TAG_END) {
+ && nextToken.getType() != MXMLTokenTypes.TOKEN_EMPTY_TAG_END
+ && nextToken.getType() != TOKEN_TYPE_EXTRA) {
requiredSpace = true;
}
if (elementStack.isEmpty()) {
@@ -1877,7 +1878,9 @@ public class FORMATTER {
if (nextToken != null && nextToken.getType() != MXMLTokenTypes.TOKEN_TAG_END
&& nextToken.getType() != MXMLTokenTypes.TOKEN_EMPTY_TAG_END) {
attributeIndent = getAttributeIndent(token);
- requiredSpace = true;
+ if(nextToken.getType() != TOKEN_TYPE_EXTRA) {
+ requiredSpace = true;
+ }
}
break;
}
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestFormatterOff.java b/formatter/src/test/java/org/apache/royale/formatter/TestFormatterOff.java
index be1fd28..27f0561 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestFormatterOff.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestFormatterOff.java
@@ -82,12 +82,12 @@ public class TestFormatterOff extends BaseFormatterTests {
// @formatter:off
"<mx:Application>\n" +
"\t<!-- @formatter:off -->\n" +
- "\t<mx:Button/>\n" +
+ "\t<mx:Button />\n" +
"\n" +
"\n" +
"\n" +
"\t<!-- @formatter:on -->\n" +
- "\t<mx:Button/>\n" +
+ "\t<mx:Button />\n" +
"\n" +
"\n" +
"\n" +
@@ -99,7 +99,7 @@ public class TestFormatterOff extends BaseFormatterTests {
// @formatter:off
"<mx:Application>\n" +
" <!-- @formatter:off -->\n" +
- "\t<mx:Button/>\n" +
+ "\t<mx:Button />\n" +
"\n" +
"\n" +
"\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestMXMLTag.java b/formatter/src/test/java/org/apache/royale/formatter/TestMXMLTag.java
index 20c85f7..0cc92e6 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestMXMLTag.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestMXMLTag.java
@@ -30,7 +30,7 @@ public class TestMXMLTag extends BaseFormatterTests {
formatter.insertSpaces = false;
String result = formatter.formatMXMLText(
// @formatter:off
- "<s:Tag/>",
+ "<s:Tag />",
// @formatter:on
problems
);