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

Fix resolve tests: now the results are checked against alt-headers

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-31 15:43:56 +04:00
parent 0a808617bb
commit b9ab6d1af2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -1
View File
@@ -646,7 +646,7 @@ public class JavaDescriptorResolver {
return resolveNamespace(psiPackage); return resolveNamespace(psiPackage);
} }
private PsiClass findClass(String qualifiedName) { public PsiClass findClass(String qualifiedName) {
PsiClass altClass = altClassFinder.findClass(qualifiedName); PsiClass altClass = altClassFinder.findClass(qualifiedName);
if (altClass != null) return altClass; if (altClass != null) return altClass;
return javaFacade.findClass(qualifiedName, javaSearchScope); return javaFacade.findClass(qualifiedName, javaSearchScope);
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+5 -4
View File
@@ -6,7 +6,6 @@ import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethod;
import com.intellij.psi.search.GlobalSearchScope;
import junit.framework.Test; import junit.framework.Test;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
@@ -16,10 +15,12 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver;
import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.lang.types.JetStandardLibrary; import org.jetbrains.jet.lang.types.JetStandardLibrary;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
@@ -102,9 +103,9 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
@NotNull @NotNull
private PsiClass findClass(String qualifiedName) { private PsiClass findClass(String qualifiedName) {
Project project = getProject(); Project project = getProject();
JavaPsiFacade javaFacade = JavaPsiFacade.getInstance(project); JetSemanticServices jetSemanticServices = JetSemanticServices.createSemanticServices(project);
GlobalSearchScope javaSearchScope = GlobalSearchScope.allScope(project); JavaSemanticServices javaSemanticServices = new JavaSemanticServices(project, jetSemanticServices, new BindingTraceContext());
return javaFacade.findClass(qualifiedName, javaSearchScope); return javaSemanticServices.getDescriptorResolver().findClass(qualifiedName);
} }
@NotNull @NotNull