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

New J2K: Adapt internal class conversion to old j2k

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-12 01:13:44 +03:00
committed by Ilya Kirillov
parent d1c1aeed0b
commit 4c880499fb
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InternalClassConversion.kt
+9 -15
View File
@@ -5,26 +5,20 @@
package org.jetbrains.kotlin.j2k.conversions
import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.tree.*
class InternalClassConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
class InternalClassConversion : RecursiveApplicableConversionBase() {
override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKClass) return recurse(element)
return recurseArmed(element, element.visibility == Visibility.INTERNAL)
}
if (element !is JKVisibilityOwner || element !is JKModalityOwner) return recurse(element)
val containingClass = element.parentOfType<JKClass>() ?: return recurse(element)
private fun recurseArmed(element: JKTreeElement, parentIsInternal: Boolean): JKTreeElement {
return applyRecursive(element, parentIsInternal, ::applyArmed)
}
private fun applyArmed(element: JKTreeElement, parentIsInternal: Boolean): JKTreeElement {
if (element is JKClass) return recurseArmed(element, parentIsInternal)
if (element !is JKVisibilityOwner) return recurseArmed(element, parentIsInternal)
val isInternal = element.visibility == Visibility.INTERNAL
if (isInternal && parentIsInternal && context.converter.settings.noInternalForMembersOfInternal) {
if (containingClass.visibility == Visibility.INTERNAL
&& element.visibility == Visibility.INTERNAL
&& element.modality == Modality.FINAL
&& (element is JKMethod || element is JKField)
) {
element.visibility = Visibility.PUBLIC
}
return recurseArmed(element, isInternal)
return recurse(element)
}
}