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

Minor, JavaClass#getOriginKind -> isKotlinLightClass

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-17 18:36:01 +03:00
parent 0ba0e2b10d
commit 0a54464420
6 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class LazyJavaPackageFragmentProvider(
private inner class FragmentClassResolver : LazyJavaClassResolver {
override fun resolveClass(javaClass: JavaClass): ClassDescriptor? {
val fqName = javaClass.fqName
if (fqName != null && javaClass.originKind == JavaClass.OriginKind.KOTLIN_LIGHT_CLASS) {
if (fqName != null && javaClass.isKotlinLightClass) {
return c.components.javaResolverCache.getClassResolvedFromSource(fqName)
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
+3 -4
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.load.java.structure.JavaClass
import org.jetbrains.kotlin.load.java.structure.JavaPackage
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
@@ -159,9 +158,9 @@ class LazyJavaPackageScope(
// neither objects nor enum members can be in java package
if (!kindFilter.acceptsKinds(DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK)) return listOf()
return jPackage.getClasses(nameFilter).asSequence()
.filter { c -> c.originKind != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS }
.map { c -> c.name }.toList()
return jPackage.getClasses(nameFilter).mapNotNull { klass ->
if (klass.isKotlinLightClass) null else klass.name
}
}
override fun getFunctionNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> {
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClass.java
+2 -9
View File
@@ -35,6 +35,8 @@ public interface JavaClass extends JavaClassifier, JavaTypeParameterListOwner, J
boolean isEnum();
boolean isKotlinLightClass();
@Nullable
JavaClass getOuterClass();
@@ -49,13 +51,4 @@ public interface JavaClass extends JavaClassifier, JavaTypeParameterListOwner, J
@NotNull
Collection<JavaConstructor> getConstructors();
@NotNull
OriginKind getOriginKind();
enum OriginKind {
COMPILED,
SOURCE,
KOTLIN_LIGHT_CLASS
}
}