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

New J2K: Rearrange conversions

Browse Source
This commit is contained in:
Ilya Kirillov
2019-02-13 16:08:39 +03:00
committed by Ilya Kirillov
parent 4aacb15872
commit b9f8ff9079
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
+2 -2
View File
@@ -46,6 +46,7 @@ object ConversionsRunner {
+EnumFieldAccessConversion(context) +EnumFieldAccessConversion(context)
+StaticMemberAccessConversion(context) +StaticMemberAccessConversion(context)
+SynchronizedStatementConversion(context) +SynchronizedStatementConversion(context)
+JetbrainsNullableAnnotationsConverter(context)
+DefaultArgumentsConversion(context) +DefaultArgumentsConversion(context)
+ConstructorConversion(context) +ConstructorConversion(context)
+StaticInitDeclarationConversion() +StaticInitDeclarationConversion()
@@ -53,7 +54,6 @@ object ConversionsRunner {
+ParameterModificationInMethodCallsConversion(context) +ParameterModificationInMethodCallsConversion(context)
+PrintlnConversion(context) +PrintlnConversion(context)
+BlockToRunConversion(context) +BlockToRunConversion(context)
+JetbrainsNullableAnnotationsConverter(context)
+PrimaryConstructorDetectConversion(context) +PrimaryConstructorDetectConversion(context)
+InsertDefaultPrimaryConstructorConversion(context) +InsertDefaultPrimaryConstructorConversion(context)
+FieldToPropertyConversion() +FieldToPropertyConversion()
@@ -71,8 +71,8 @@ object ConversionsRunner {
+BuiltinMembersConversion(context) +BuiltinMembersConversion(context)
+EqualsOperatorConversion(context) +EqualsOperatorConversion(context)
+TypeMappingConversion(context) +TypeMappingConversion(context)
+ImplicitCastsConversion(context)
+LowerNullabilityInFunctionParametersConversion(context) +LowerNullabilityInFunctionParametersConversion(context)
+ImplicitCastsConversion(context)
+DefaultNullabilityToNullableConversion() +DefaultNullabilityToNullableConversion()
+NullableQualifierConversion(context) +NullableQualifierConversion(context)
+InternalClassConversion() +InternalClassConversion()
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt
+1 -7
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.nj2k.conversions package org.jetbrains.kotlin.nj2k.conversions
import org.jetbrains.kotlin.nj2k.ConversionContext import org.jetbrains.kotlin.nj2k.ConversionContext
import org.jetbrains.kotlin.nj2k.replace
import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.tree.*
import org.jetbrains.kotlin.nj2k.tree.impl.JKKtInitDeclarationImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKKtInitDeclarationImpl
import org.jetbrains.kotlin.nj2k.tree.impl.JKKtPrimaryConstructorImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKKtPrimaryConstructorImpl
@@ -20,13 +21,6 @@ class PrimaryConstructorDetectConversion(private val context: ConversionContext)
return recurse(element) return recurse(element)
} }
private fun <T> List<T>.replace(element: T, replacer: T): List<T> {
val mutableList = toMutableList()
val index = indexOf(element)
mutableList[index] = replacer
return mutableList
}
private fun processClass(element: JKClass) { private fun processClass(element: JKClass) {
val constructors = element.declarationList.filterIsInstance<JKKtConstructor>() val constructors = element.declarationList.filterIsInstance<JKKtConstructor>()
if (constructors.any { it is JKKtPrimaryConstructor }) return if (constructors.any { it is JKKtPrimaryConstructor }) return