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

DescriptorSearchRule removed

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-05 02:47:21 +04:00
committed by Alexander Udalov
parent aa0dde3a78
commit 8dc9aecbf8
11 changed files with 11 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+1 -2
View File
@@ -45,7 +45,6 @@ import java.util.*;
import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver;
import static org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer.UNSUPPORTED;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
public abstract class AbstractDescriptorSerializationTest extends KotlinTestWithEnvironment {
@@ -182,7 +181,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
@Override
public ClassDescriptor findClass(@NotNull ClassId classId) {
ClassDescriptor found = super.findClass(classId);
return found != null ? found : javaDescriptorResolver.resolveClass(classId.asSingleFqName().toSafe(), IGNORE_KOTLIN_SOURCES);
return found != null ? found : javaDescriptorResolver.resolveClass(classId.asSingleFqName().toSafe());
}
@Nullable
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
+1 -3
View File
@@ -57,8 +57,6 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public class JdkAnnotationsValidityTest extends UsefulTestCase {
private static final int CLASSES_IN_CHUNK = 500;
@@ -124,7 +122,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
int chunkStart = chunkIndex * CLASSES_IN_CHUNK;
for (FqName javaClass : affectedClasses.subList(chunkStart, Math.min(chunkStart + CLASSES_IN_CHUNK, affectedClasses.size()))) {
ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass, IGNORE_KOTLIN_SOURCES);
ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass);
PackageViewDescriptor topLevelPackage = injector.getModule().getPackage(javaClass);
if (topLevelClass == null) {
continue;
compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+1 -3
View File
@@ -46,8 +46,6 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public class ResolveDescriptorsFromExternalLibraries {
@@ -203,7 +201,7 @@ public class ResolveDescriptorsFromExternalLibraries {
String className = entryName.substring(0, entryName.length() - ".class".length()).replace("/", ".");
try {
ClassDescriptor clazz = javaDescriptorResolver.resolveClass(new FqName(className), IGNORE_KOTLIN_SOURCES);
ClassDescriptor clazz = javaDescriptorResolver.resolveClass(new FqName(className));
if (clazz == null) {
throw new IllegalStateException("class not found by name " + className + " in " + libDescription);
}