From 3be8da5607dae2e9146f9d2dd80749f9813f5aba Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 29 Apr 2014 19:42:31 +0400
Subject: [PATCH] Minor. More convenient function used

---
 .../jetbrains/jet/plugin/DirectiveBasedActionUtils.java   | 5 +----
 .../codeInsight/AbstractInsertImportOnPasteTest.java      | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java
index 7d97ed9df68..4e2d3ec5891 100644
--- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java
+++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java
@@ -25,7 +25,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.InTextDirectivesUtils;
-import org.jetbrains.jet.analyzer.AnalyzeExhaust;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.diagnostics.Severity;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -45,9 +44,7 @@ public class DirectiveBasedActionUtils {
             return;
         }
 
-        AnalyzeExhaust exhaust = ResolvePackage.getAnalysisResults(file);
-
-        Collection<Diagnostic> diagnostics = exhaust.getBindingContext().getDiagnostics().all();
+        Collection<Diagnostic> diagnostics = ResolvePackage.getBindingContext(file).getDiagnostics().all();
         Collection<Diagnostic> errorDiagnostics = Collections2.filter(diagnostics, new Predicate<Diagnostic>() {
             @Override
             public boolean apply(@Nullable Diagnostic diagnostic) {
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java
index d8597302605..af358a5d35f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.InTextDirectivesUtils;
-import org.jetbrains.jet.analyzer.AnalyzeExhaust;
 import org.jetbrains.jet.checkers.DebugInfoUtil;
 import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
@@ -30,6 +29,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetReferenceExpression;
+import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
@@ -97,8 +97,8 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh
     }
 
     private static void checkNoUnresolvedReferences(@NotNull final JetFile file) {
-        AnalyzeExhaust exhaust = ResolvePackage.getAnalysisResults(file);
-        for (Diagnostic diagnostic : exhaust.getBindingContext().getDiagnostics()) {
+        BindingContext bindingContext = ResolvePackage.getBindingContext(file);
+        for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
             if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) {
                 List<TextRange> textRanges = diagnostic.getTextRanges();
                 String diagnosticText = DefaultErrorMessages.RENDERER.render(diagnostic);
@@ -108,7 +108,7 @@ public abstract class AbstractInsertImportOnPasteTest extends JetLightCodeInsigh
                 }
             }
         }
-        DebugInfoUtil.markDebugAnnotations(file, exhaust.getBindingContext(), new DebugInfoUtil.DebugInfoReporter() {
+        DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() {
             @Override
             public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) {
                 //do nothing