From 03a4a5ef3159c2be8956a45c28b988da7210ac5f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 10 Jun 2014 16:50:33 +0400 Subject: [PATCH] Use module to resolve top level class in SignatureMarkerProviderTest --- .../ktSignature/SignatureMarkerProviderTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java b/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java index 0e92ce47b8a..2520cdef3bf 100644 --- a/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java @@ -24,15 +24,17 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; -import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import static org.jetbrains.jet.lang.resolve.ResolvePackage.resolveTopLevelClass; + public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase { @NotNull @@ -49,11 +51,10 @@ public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase PsiFile file = myFixture.configureByText(JetFileType.INSTANCE, "val t: Thread? = null"); PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass("java.lang.Thread", GlobalSearchScope.allScope(project)); - BindingContext context = ResolvePackage.getBindingContext((JetFile) file); - ClassDescriptor preResolvedClass = context.get(BindingContext.CLASS, psiClass); + AnalyzeExhaust analysisResults = ResolvePackage.getAnalysisResults((JetFile) file); + ClassDescriptor preResolvedClass = analysisResults.getBindingContext().get(BindingContext.CLASS, psiClass); - ClassDescriptor reResolvedClass = JavaResolveExtension.instance$.get(project) - .resolveClass(new FqName("java.lang.Thread")); + ClassDescriptor reResolvedClass = resolveTopLevelClass(analysisResults.getModuleDescriptor(), new FqName("java.lang.Thread")); assertSame(preResolvedClass, reResolvedClass); }