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

New J2K: reduce count of post-processing groups

Browse Source
This commit is contained in:
Ilya Kirillov
2019-09-27 22:50:25 +03:00
parent 208c4d6fc7
commit aaf05d5eb2
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt
+9 -18
View File
@@ -223,7 +223,7 @@ private val cleaningUpDiagnosticBasedPostProcessingGroup =
private val processings: List<NamedPostProcessingGroup> = listOf( private val processings: List<NamedPostProcessingGroup> = listOf(
NamedPostProcessingGroup( NamedPostProcessingGroup(
"Inferring declarations nullability", "Inferring types",
listOf( listOf(
InspectionLikeProcessingGroup( InspectionLikeProcessingGroup(
processings = listOf( processings = listOf(
@@ -239,14 +239,13 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
), ),
NamedPostProcessingGroup( NamedPostProcessingGroup(
"Formatting code", "Formatting code",
listOf(FormatCodeProcessing()) listOf(
FormatCodeProcessing(),
ShortenReferenceProcessing()
)
), ),
NamedPostProcessingGroup( NamedPostProcessingGroup(
"Shortening fully-qualified references", "Cleaning up code",
listOf(ShortenReferenceProcessing())
),
NamedPostProcessingGroup(
"Converting POJOs to data classes",
listOf( listOf(
InspectionLikeProcessingGroup(VarToValProcessing()), InspectionLikeProcessingGroup(VarToValProcessing()),
ConvertGettersAndSettersToPropertyProcessing(), ConvertGettersAndSettersToPropertyProcessing(),
@@ -255,12 +254,7 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
RemoveExplicitGetterInspectionBasedProcessing(), RemoveExplicitGetterInspectionBasedProcessing(),
RemoveExplicitSetterInspectionBasedProcessing() RemoveExplicitSetterInspectionBasedProcessing()
), ),
ConvertToDataClassProcessing() ConvertToDataClassProcessing(),
)
),
NamedPostProcessingGroup(
"Cleaning up Kotlin code",
listOf(
errorsFixingDiagnosticBasedPostProcessingGroup, errorsFixingDiagnosticBasedPostProcessingGroup,
addOrRemoveModifiersProcessingGroup, addOrRemoveModifiersProcessingGroup,
inspectionLikePostProcessingGroup, inspectionLikePostProcessingGroup,
@@ -273,11 +267,8 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
"Optimizing imports", "Optimizing imports",
listOf( listOf(
OptimizeImportsProcessing(), OptimizeImportsProcessing(),
ShortenReferenceProcessing() ShortenReferenceProcessing(),
FormatCodeProcessing()
) )
),
NamedPostProcessingGroup(
"Formatting code",
listOf(FormatCodeProcessing())
) )
) )