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 d55f55bd4b53b88ac306f63761912de63ca64de5 Author: Josh Tynjala <joshtynj...@apache.org> AuthorDate: Wed May 18 10:08:08 2022 -0700 formatter: print syntax errors when called from command line --- .../src/main/java/org/apache/royale/formatter/FORMATTER.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 d6fae8340..e93a773dc 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java @@ -38,6 +38,7 @@ import org.apache.royale.compiler.clients.problems.CompilerProblemCategorizer; import org.apache.royale.compiler.clients.problems.ProblemFormatter; import org.apache.royale.compiler.clients.problems.ProblemPrinter; import org.apache.royale.compiler.clients.problems.ProblemQuery; +import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter; import org.apache.royale.compiler.common.VersionInfo; import org.apache.royale.compiler.exceptions.ConfigurationException; import org.apache.royale.compiler.internal.config.localization.LocalizationManager; @@ -140,6 +141,7 @@ public class FORMATTER { public int execute(String[] args) { ExitCode exitCode = ExitCode.SUCCESS; problems = new ProblemQuery(); + problems.setShowWarnings(false); try { boolean continueFormatting = configure(args, problems); @@ -156,7 +158,7 @@ public class FORMATTER { } String filePath = FilenameNormalization.normalize("stdin.as"); String fileText = builder.toString(); - String formattedText = formatFileText(filePath, fileText); + String formattedText = formatFileText(filePath, fileText, problems.getProblems()); if (!fileText.equals(formattedText)) { if (listChangedFiles) { System.out.println(filePath); @@ -169,7 +171,7 @@ public class FORMATTER { for (File inputFile : inputFiles) { String filePath = FilenameNormalization.normalize(inputFile.getAbsolutePath()); String fileText = FileUtils.readFileToString(inputFile, "utf8"); - String formattedText = formatFileText(filePath, fileText); + String formattedText = formatFileText(filePath, fileText, problems.getProblems()); if (!fileText.equals(formattedText)) { if (listChangedFiles) { System.out.println(filePath); @@ -194,7 +196,8 @@ public class FORMATTER { exitCode = ExitCode.FAILED_WITH_EXCEPTIONS; } finally { if (problems.hasFilteredProblems()) { - final ProblemPrinter printer = new ProblemPrinter(ProblemFormatter.DEFAULT_FORMATTER); + final ProblemFormatter formatter = new WorkspaceProblemFormatter(new Workspace()); + final ProblemPrinter printer = new ProblemPrinter(formatter); printer.printProblems(problems.getFilteredProblems()); } }