azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use module to resolve top level class in SignatureMarkerProviderTest

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-10 16:50:33 +04:00
parent 456e83e1fa
commit 03a4a5ef31
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/ktSignature/SignatureMarkerProviderTest.java
+6 -5
View File
@@ -24,15 +24,17 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import static org.jetbrains.jet.lang.resolve.ResolvePackage.resolveTopLevelClass;
public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase { public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase {
@NotNull @NotNull
@@ -49,11 +51,10 @@ public class SignatureMarkerProviderTest extends LightCodeInsightFixtureTestCase
PsiFile file = myFixture.configureByText(JetFileType.INSTANCE, "val t: Thread? = null"); PsiFile file = myFixture.configureByText(JetFileType.INSTANCE, "val t: Thread? = null");
PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass("java.lang.Thread", GlobalSearchScope.allScope(project)); PsiClass psiClass = JavaPsiFacade.getInstance(project).findClass("java.lang.Thread", GlobalSearchScope.allScope(project));
BindingContext context = ResolvePackage.getBindingContext((JetFile) file); AnalyzeExhaust analysisResults = ResolvePackage.getAnalysisResults((JetFile) file);
ClassDescriptor preResolvedClass = context.get(BindingContext.CLASS, psiClass); ClassDescriptor preResolvedClass = analysisResults.getBindingContext().get(BindingContext.CLASS, psiClass);
ClassDescriptor reResolvedClass = JavaResolveExtension.instance$.get(project) ClassDescriptor reResolvedClass = resolveTopLevelClass(analysisResults.getModuleDescriptor(), new FqName("java.lang.Thread"));
.resolveClass(new FqName("java.lang.Thread"));
assertSame(preResolvedClass, reResolvedClass); assertSame(preResolvedClass, reResolvedClass);
} }