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

Rename: BuiltinOverridabilityCondition -> JavaIncompatibilityRulesOverridabilityConditionBuiltinOverridabilityCondition

Browse Source
This commit is contained in:
Denis Zharkov
2016-06-30 20:51:07 +03:00
parent 6284598eff
commit dc713cda2c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition
+1 -1
View File
@@ -1,3 +1,3 @@
org.jetbrains.kotlin.load.java.FieldOverridabilityCondition org.jetbrains.kotlin.load.java.FieldOverridabilityCondition
org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition
org.jetbrains.kotlin.load.java.BuiltinOverridabilityCondition org.jetbrains.kotlin.load.java.JavaIncompatibilityRulesOverridabilityCondition
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt → core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition.Result
import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.resolve.OverridingUtil
import org.jetbrains.kotlin.resolve.descriptorUtil.isDocumentedAnnotation import org.jetbrains.kotlin.resolve.descriptorUtil.isDocumentedAnnotation
class BuiltinOverridabilityCondition : ExternalOverridabilityCondition { class JavaIncompatibilityRulesOverridabilityCondition : ExternalOverridabilityCondition {
override fun isOverridable(superDescriptor: CallableDescriptor, subDescriptor: CallableDescriptor, subClassDescriptor: ClassDescriptor?): Result { override fun isOverridable(superDescriptor: CallableDescriptor, subDescriptor: CallableDescriptor, subClassDescriptor: ClassDescriptor?): Result {
if (superDescriptor !is CallableMemberDescriptor || subDescriptor !is FunctionDescriptor || subDescriptor.isFromBuiltins()) { if (superDescriptor !is CallableMemberDescriptor || subDescriptor !is FunctionDescriptor || subDescriptor.isFromBuiltins()) {
return Result.UNKNOWN return Result.UNKNOWN