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

Temporary rename of properties starting with "is" and used from java code (will revert back after changing accessor naming policy)

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-09-23 18:52:20 +03:00
parent 1941827780
commit 98da621ab3
49 changed files with 87 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassInfo.kt
+3 -4
View File
@@ -17,13 +17,12 @@
package org.jetbrains.kotlin.fileClasses
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
public interface JvmFileClassInfo {
public val fileClassFqName: FqName
public val facadeClassFqName: FqName
public val isWithJvmName: Boolean
public val isMultifileClass: Boolean
public val TEMP_isMultifileClass: Boolean
}
public class JvmSimpleFileClassInfo(
@@ -31,7 +30,7 @@ public class JvmSimpleFileClassInfo(
override val isWithJvmName: Boolean
) : JvmFileClassInfo {
override val facadeClassFqName: FqName get() = fileClassFqName
override val isMultifileClass: Boolean get() = false
override val TEMP_isMultifileClass: Boolean get() = false
}
public class JvmMultifileClassPartInfo(
@@ -39,6 +38,6 @@ public class JvmMultifileClassPartInfo(
override val facadeClassFqName: FqName
) : JvmFileClassInfo {
override val isWithJvmName: Boolean get() = true
override val isMultifileClass: Boolean get() = true
override val TEMP_isMultifileClass: Boolean get() = true
}
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatformConfigurator.kt
+1 -1
View File
@@ -273,7 +273,7 @@ public class OverloadsAnnotationChecker: DeclarationChecker {
if (descriptor is FunctionDescriptor && descriptor.getModality() == Modality.ABSTRACT) {
diagnosticHolder.report(ErrorsJvm.OVERLOADS_ABSTRACT.on(declaration))
}
else if ((!descriptor.getVisibility().isPublicAPI && descriptor.getVisibility() != Visibilities.INTERNAL) ||
else if ((!descriptor.getVisibility().TEMP_isPublicAPI && descriptor.getVisibility() != Visibilities.INTERNAL) ||
DescriptorUtils.isLocal(descriptor)) {
diagnosticHolder.report(ErrorsJvm.OVERLOADS_PRIVATE.on(declaration))
}
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/syntheticExtensionsUtils.kt
+1 -1
View File
@@ -34,7 +34,7 @@ fun syntheticExtensionVisibility(originalDescriptor: DeclarationDescriptorWithVi
return when (originalVisibility) {
Visibilities.PUBLIC -> Visibilities.PUBLIC
else -> object : Visibility(originalVisibility.name, originalVisibility.isPublicAPI) {
else -> object : Visibility(originalVisibility.name, originalVisibility.TEMP_isPublicAPI) {
override fun isVisible(receiver: ReceiverValue, what: DeclarationDescriptorWithVisibility, from: DeclarationDescriptor)
= originalVisibility.isVisible(receiver, originalDescriptor, from)