From 4aa5a90370d58e1277931435aa04052abf33e005 Mon Sep 17 00:00:00 2001 From: Dmitry Kovanikov Date: Wed, 16 Sep 2015 12:10:25 +0300 Subject: [PATCH] [cli-repl] Minor: change API to support ABI reporting --- .../messages/AnalyzerWithCompilerReport.java | 16 ++++++++++++++-- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index a51e610d5b1..12060228b3f 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -171,7 +171,11 @@ public final class AnalyzerWithCompilerReport { } } - public static boolean reportDiagnostics(@NotNull Diagnostics diagnostics, @NotNull DiagnosticMessageReporter reporter, boolean incompatibleFilesFound) { + public static boolean reportDiagnostics( + @NotNull Diagnostics diagnostics, + @NotNull DiagnosticMessageReporter reporter, + boolean incompatibleFilesFound + ) { boolean hasErrors = false; for (Diagnostic diagnostic : sortedDiagnostics(diagnostics.all())) { hasErrors |= reportDiagnostic(diagnostic, reporter, incompatibleFilesFound); @@ -179,10 +183,18 @@ public final class AnalyzerWithCompilerReport { return hasErrors; } - public static boolean reportDiagnostics(@NotNull Diagnostics diagnostics, @NotNull MessageCollector messageCollector, boolean incompatibleFilesFound) { + public static boolean reportDiagnostics( + @NotNull Diagnostics diagnostics, + @NotNull MessageCollector messageCollector, + boolean incompatibleFilesFound + ) { return reportDiagnostics(diagnostics, new DefaultDiagnosticReporter(messageCollector), incompatibleFilesFound); } + public static boolean reportDiagnostics(@NotNull Diagnostics diagnostics, @NotNull MessageCollector messageCollector) { + return reportDiagnostics(diagnostics, new DefaultDiagnosticReporter(messageCollector), false); + } + private void reportSyntaxErrors(@NotNull Collection files) { for (JetFile file : files) { reportSyntaxErrors(file, messageCollector); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 5fd304664a0..86c5ef18814 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -406,7 +406,7 @@ public class ReplInterpreter { trace.record(BindingContext.FILE_TO_PACKAGE_FRAGMENT, psiFile, resolveSession.getPackageFragment(FqName.ROOT)); } - boolean hasErrors = AnalyzerWithCompilerReport.reportDiagnostics(trace.getBindingContext().getDiagnostics(), errorReporter); + boolean hasErrors = AnalyzerWithCompilerReport.reportDiagnostics(trace.getBindingContext().getDiagnostics(), errorReporter, false); if (hasErrors) { return null; }