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 33db4870e563dcaeb164f483b3097201ffb66028 Author: Josh Tynjala <[email protected]> AuthorDate: Thu Jul 14 10:30:30 2022 -0700 formatter: display problem severity --- .../org/apache/royale/formatter/FORMATTER.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 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 fc36d0989..8c6c75328 100644 --- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java +++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java @@ -130,7 +130,7 @@ public class FORMATTER { public boolean mxmlAlignAttributes = false; public boolean mxmlInsertNewLineBetweenAttributes = false; - private ProblemQuery problems; + private ProblemQuery problemQuery; private List<File> inputFiles = new ArrayList<File>(); private boolean writeBackToInputFiles = false; private boolean listChangedFiles = false; @@ -139,11 +139,11 @@ public class FORMATTER { public int execute(String[] args) { ExitCode exitCode = ExitCode.SUCCESS; - problems = new ProblemQuery(); - problems.setShowWarnings(false); + problemQuery = new ProblemQuery(); + problemQuery.setShowWarnings(false); try { - boolean continueFormatting = configure(args, problems); + boolean continueFormatting = configure(args, problemQuery); if (continueFormatting) { if (inputFiles.size() == 0) { StringBuilder builder = new StringBuilder(); @@ -157,7 +157,7 @@ public class FORMATTER { } String filePath = FilenameNormalization.normalize("stdin.as"); String fileText = builder.toString(); - String formattedText = formatFileText(filePath, fileText, problems.getProblems()); + String formattedText = formatFileText(filePath, fileText, problemQuery.getProblems()); if (!fileText.equals(formattedText)) { if (listChangedFiles) { System.out.println(filePath); @@ -170,7 +170,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, problems.getProblems()); + String formattedText = formatFileText(filePath, fileText, problemQuery.getProblems()); if (!fileText.equals(formattedText)) { if (listChangedFiles) { System.out.println(filePath); @@ -184,20 +184,22 @@ public class FORMATTER { } } } - } else if (problems.hasFilteredProblems()) { + } else if (problemQuery.hasFilteredProblems()) { exitCode = ExitCode.FAILED_WITH_CONFIG_PROBLEMS; } else { exitCode = ExitCode.PRINT_HELP; } } catch (Exception e) { - problems.add(new UnexpectedExceptionProblem(e)); + problemQuery.add(new UnexpectedExceptionProblem(e)); System.err.println(e.getMessage()); exitCode = ExitCode.FAILED_WITH_EXCEPTIONS; } finally { - if (problems.hasFilteredProblems()) { - final ProblemFormatter formatter = new WorkspaceProblemFormatter(new Workspace()); + if (problemQuery.hasFilteredProblems()) { + final Workspace workspace = new Workspace(); + final CompilerProblemCategorizer categorizer = new CompilerProblemCategorizer(); + final ProblemFormatter formatter = new WorkspaceProblemFormatter(workspace, categorizer); final ProblemPrinter printer = new ProblemPrinter(formatter); - printer.printProblems(problems.getFilteredProblems()); + printer.printProblems(problemQuery.getFilteredProblems()); } } return exitCode.getCode();
