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

Expect modifier definitions is not exposed by UL-classes

Browse Source
This commit is contained in:
Igor Yakovlev
2019-07-04 16:04:06 +03:00
parent 0602a6da72
commit cd6abcd4c9
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMembersCreator.kt
+10 -3
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.load.kotlin.TypeMappingMode
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
import org.jetbrains.kotlin.psi.psiUtil.hasSuspendModifier import org.jetbrains.kotlin.psi.psiUtil.hasSuspendModifier
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -62,7 +63,7 @@ internal class UltraLightMembersCreator(
val property = variable as? KtProperty val property = variable as? KtProperty
if (property != null && !hasBackingField(property)) return null if (property != null && !hasBackingField(property)) return null
if (variable.hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME)) return null if (variable.hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) || variable.hasExpectModifier()) return null
val hasDelegate = property?.hasDelegate() == true val hasDelegate = property?.hasDelegate() == true
val fieldName = generateUniqueFieldName((variable.name ?: "") + (if (hasDelegate) "\$delegate" else ""), usedPropertyNames) val fieldName = generateUniqueFieldName((variable.name ?: "") + (if (hasDelegate) "\$delegate" else ""), usedPropertyNames)
@@ -109,7 +110,10 @@ internal class UltraLightMembersCreator(
forcePrivate: Boolean = false forcePrivate: Boolean = false
): Collection<KtLightMethod> { ): Collection<KtLightMethod> {
if (ktFunction.hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) || ktFunction.hasReifiedParameters()) return emptyList() if (ktFunction.hasAnnotation(JVM_SYNTHETIC_ANNOTATION_FQ_NAME) ||
ktFunction.hasReifiedParameters() ||
ktFunction.hasExpectModifier()
) return emptyList()
val basicMethod = asJavaMethod(ktFunction, forceStatic, forcePrivate) val basicMethod = asJavaMethod(ktFunction, forceStatic, forcePrivate)
@@ -361,7 +365,10 @@ internal class UltraLightMembersCreator(
): List<KtLightMethod> { ): List<KtLightMethod> {
val propertyName = declaration.name ?: return emptyList() val propertyName = declaration.name ?: return emptyList()
if (declaration.isConstOrJvmField() || declaration.hasReifiedParameters()) return emptyList() if (declaration.isConstOrJvmField() ||
declaration.hasReifiedParameters() ||
declaration.hasExpectModifier()
) return emptyList()
val ktGetter = (declaration as? KtProperty)?.getter val ktGetter = (declaration as? KtProperty)?.getter
val ktSetter = (declaration as? KtProperty)?.setter val ktSetter = (declaration as? KtProperty)?.setter
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
-3
View File
@@ -148,9 +148,6 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
} }
private fun findTooComplexDeclaration(declaration: KtDeclaration): PsiElement? { private fun findTooComplexDeclaration(declaration: KtDeclaration): PsiElement? {
if (declaration.hasExpectModifier()) {
return declaration
}
if (declaration is KtClassOrObject) { if (declaration is KtClassOrObject) {
declaration.primaryConstructor?.let { findTooComplexDeclaration(it) }?.let { return it } declaration.primaryConstructor?.let { findTooComplexDeclaration(it) }?.let { return it }