From f79ddbd5231564782350c3c4881edd074fe4f251 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 4 Jun 2014 17:06:09 +0400 Subject: [PATCH] Minor. Passing Diagnostics instead of BindingContext --- .../common/messages/AnalyzerWithCompilerReport.java | 11 ++++------- .../cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 6 ++++-- .../jetbrains/jet/cli/jvm/repl/ReplInterpreter.java | 2 +- .../CompileKotlinAgainstCustomBinariesTest.java | 2 +- .../jet/plugin/highlighter/NoErrorsInStdlibTest.kt | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java index edf1b8dbc41..195cbe4c18f 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java @@ -31,10 +31,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; @@ -154,9 +151,9 @@ public final class AnalyzerWithCompilerReport { } } - public static boolean reportDiagnostics(@NotNull BindingContext bindingContext, @NotNull MessageCollector messageCollector) { + public static boolean reportDiagnostics(@NotNull Diagnostics diagnostics, @NotNull MessageCollector messageCollector) { boolean hasErrors = false; - for (Diagnostic diagnostic : sortedDiagnostics(bindingContext.getDiagnostics().all())) { + for (Diagnostic diagnostic : sortedDiagnostics(diagnostics.all())) { hasErrors |= reportDiagnostic(diagnostic, messageCollector); } return hasErrors; @@ -227,7 +224,7 @@ public final class AnalyzerWithCompilerReport { reportAbiVersionErrors(); reportSyntaxErrors(files); //noinspection ConstantConditions - reportDiagnostics(analyzeExhaust.getBindingContext(), messageCollectorWrapper); + reportDiagnostics(analyzeExhaust.getBindingContext().getDiagnostics(), messageCollectorWrapper); reportIncompleteHierarchies(); reportAlternativeSignatureErrors(); } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index f9bab06f43e..d614ece9389 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -345,8 +345,10 @@ public class KotlinToJVMBytecodeCompiler { diagnosticHolder ); KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION); - AnalyzerWithCompilerReport.reportDiagnostics(diagnosticHolder.getBindingContext(), - environment.getConfiguration().get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)); + AnalyzerWithCompilerReport.reportDiagnostics( + diagnosticHolder.getBindingContext().getDiagnostics(), + environment.getConfiguration().get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) + ); return generationState; } } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index 095f9d335fd..58d27d96a72 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -319,7 +319,7 @@ public class ReplInterpreter { injector.getTopDownAnalyzer().doProcess(topDownAnalysisContext, scope, new PackageLikeBuilderDummy(), Collections.singletonList(psiFile)); - boolean hasErrors = AnalyzerWithCompilerReport.reportDiagnostics(trace.getBindingContext(), messageCollector); + boolean hasErrors = AnalyzerWithCompilerReport.reportDiagnostics(trace.getBindingContext().getDiagnostics(), messageCollector); if (hasErrors) { return null; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 4fcf0cfe5dc..59b74d4188e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -180,7 +180,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { exhaust.throwIfError(); BindingContext bindingContext = exhaust.getBindingContext(); - AnalyzerWithCompilerReport.reportDiagnostics(bindingContext, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR); + AnalyzerWithCompilerReport.reportDiagnostics(bindingContext.getDiagnostics(), MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR); assertEquals("There should be no diagnostics", 0, Iterables.size(bindingContext.getDiagnostics())); } diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt index d1aa1dd76db..854fd43ff76 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt @@ -52,7 +52,7 @@ public class NoErrorsInStdlibTest: LightCodeInsightFixtureTestCase() { if (!errors.isEmpty()) { System.err.println("${psiFile.getName()}: ${errors.size()} errors") AnalyzerWithCompilerReport.reportDiagnostics( - bindingContext, MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR) + bindingContext.getDiagnostics(), MessageCollectorPlainTextToStream.PLAIN_TEXT_TO_SYSTEM_ERR) totalErrors += errors.size() }