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 681bc807249a4cfae0bb13be9592c223b4c124a1 Author: Josh Tynjala <[email protected]> AuthorDate: Wed Sep 27 09:53:26 2023 -0700 formatter: fix configuration from asformat-config.xml getting overwritten by legacy settings --- .../main/java/org/apache/royale/formatter/FORMATTER.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 38dab06e2..43616e071 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java @@ -191,7 +191,7 @@ public class FORMATTER { @Deprecated public boolean mxmlInsertNewLineBetweenAttributes = false; - private FormatterSettings settings = new FormatterSettings(); + private FormatterSettings settings = null; private ProblemQuery problemQuery; private List<File> inputFiles = new ArrayList<File>(); @@ -293,7 +293,9 @@ public class FORMATTER { */ @Deprecated public String formatFileText(String filePath, String text, Collection<ICompilerProblem> problems) { - settings = getLegacyFormatterSettings(); + if (settings == null) { + settings = getLegacyFormatterSettings(); + } filePath = FilenameNormalization.normalize(filePath); String result = null; if (filePath.endsWith(".mxml")) { @@ -320,7 +322,9 @@ public class FORMATTER { */ @Deprecated public String formatActionScriptText(String text, Collection<ICompilerProblem> problems) { - settings = getLegacyFormatterSettings(); + if (settings == null) { + settings = getLegacyFormatterSettings(); + } String filePath = FilenameNormalization.normalize("stdin.as"); return formatASTokens(filePath, text, problems); } @@ -338,7 +342,9 @@ public class FORMATTER { */ @Deprecated public String formatMXMLText(String text, Collection<ICompilerProblem> problems) { - settings = getLegacyFormatterSettings(); + if (settings == null) { + settings = getLegacyFormatterSettings(); + } String filePath = FilenameNormalization.normalize("stdin.mxml"); return formatMXMLTokens(filePath, text, problems); }
