New J2K: Use converter settings values in post processing

This commit is contained in:
Ilya Kirillov
2019-01-28 14:07:08 +03:00
committed by Ilya Kirillov
parent f9a08ad770
commit 1e7b1f8716
7 changed files with 36 additions and 12 deletions
@@ -38,7 +38,6 @@ object ConversionsRunner {
+PolyadicExpressionConversion(context)
+OperatorExpressionConversion(context)
+ThrowStatementConversion()
+EnumClassConversion()
+ArrayInitializerConversion(context)
+TryStatementConversion(context)
+SynchronizedStatementConversion(context)
@@ -60,7 +59,7 @@ object ConversionsRunner {
+LiteralConversion()
+ForConversion(context)
+LabeledStatementConversion()
+ForInConversion()
+ForInConversion(context)
+TypeParametersNullabilityConversion()
+ArrayOperationsConversion(context)
+BuiltinMembersConversion(context)
@@ -33,6 +33,6 @@ class AfterConversionPass(val project: Project, val postProcessor: PostProcessor
null
}
postProcessor.doAdditionalProcessing(kotlinFile, rangeMarker)
postProcessor.doAdditionalProcessing(kotlinFile, rangeMarker, null)
}
}
@@ -39,7 +39,7 @@ import java.util.*
interface PostProcessor {
fun insertImport(file: KtFile, fqName: FqName)
fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?)
fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?, settings: ConverterSettings?)
}
enum class ParseContext {
@@ -36,7 +36,7 @@ abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKo
factory.createFileWithLightClassSupport("Dummy.kt", it, file)
}.map {
CommandProcessor.getInstance().runUndoTransparentAction {
postProcessor.doAdditionalProcessing(it, null)
postProcessor.doAdditionalProcessing(it, null, settings)
}
it.text
}.single()