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

New J2K: Extract common conversions logic to base class

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-05-29 15:20:52 +03:00
committed by Ilya Kirillov
parent 003cee8cc1
commit c84ecb162e
2 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldToPropertyConversion.kt
+2 -15
View File
@@ -5,25 +5,12 @@
package org.jetbrains.kotlin.j2k.conversions package org.jetbrains.kotlin.j2k.conversions
import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.impl.JKBlockImpl import org.jetbrains.kotlin.j2k.tree.impl.JKBlockImpl
import org.jetbrains.kotlin.j2k.tree.impl.JKKtPropertyImpl import org.jetbrains.kotlin.j2k.tree.impl.JKKtPropertyImpl
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
class FieldToPropertyConversion : MatchBasedConversion() { class FieldToPropertyConversion : RecursiveApplicableConversionBase() {
override fun onElementChanged(new: JKTreeElement, old: JKTreeElement) {
somethingChanged = true
}
var somethingChanged = false
override fun runConversion(treeRoot: JKTreeElement, context: ConversionContext): Boolean {
val root = applyToElement(treeRoot)
assert(root === treeRoot)
return somethingChanged
}
data class PropertyInfo( data class PropertyInfo(
val name: String, val name: String,
@@ -32,7 +19,7 @@ class FieldToPropertyConversion : MatchBasedConversion() {
var field: JKJavaField? = null var field: JKJavaField? = null
) )
fun applyToElement(element: JKTreeElement): JKTreeElement { override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKClass) return applyRecursive(element, this::applyToElement) if (element !is JKClass) return applyRecursive(element, this::applyToElement)
val propertyInfos = mutableMapOf<String, PropertyInfo>() val propertyInfos = mutableMapOf<String, PropertyInfo>()
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+2 -14
View File
@@ -22,21 +22,9 @@ import org.jetbrains.kotlin.psi.analysisContext
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
class TypeMappingConversion(val context: ConversionContext) : MatchBasedConversion() { class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicableConversionBase() {
override fun onElementChanged(new: JKTreeElement, old: JKTreeElement) {
somethingChanged = true
}
override fun runConversion(treeRoot: JKTreeElement, context: ConversionContext): Boolean { override fun applyToElement(element: JKTreeElement): JKTreeElement {
val root = applyToElement(treeRoot)
assert(root === treeRoot)
return somethingChanged
}
var somethingChanged = false
fun applyToElement(element: JKTreeElement): JKTreeElement {
return if (element is JKTypeElement) { return if (element is JKTypeElement) {
val type = element.type val type = element.type
when (type) { when (type) {