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

New J2K: save comments in data classed conversion

Browse Source
This commit is contained in:
Ilya Kirillov
2019-04-08 18:56:15 +03:00
parent d4f6558e8a
commit cb1b597b51
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/ConvertDataClass.kt
+3
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.idea.core.copied import org.jetbrains.kotlin.idea.core.copied
import org.jetbrains.kotlin.idea.intentions.addUseSiteTarget import org.jetbrains.kotlin.idea.intentions.addUseSiteTarget
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.idea.util.CommentSaver
import org.jetbrains.kotlin.nj2k.NewJ2kPostProcessing import org.jetbrains.kotlin.nj2k.NewJ2kPostProcessing
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.addRemoveModifier.setModifierList import org.jetbrains.kotlin.psi.addRemoveModifier.setModifierList
@@ -73,6 +74,7 @@ class ConvertDataClass : NewJ2kPostProcessing {
constructorParameter.addBefore(property.valOrVarKeyword, constructorParameter.nameIdentifier!!) constructorParameter.addBefore(property.valOrVarKeyword, constructorParameter.nameIdentifier!!)
constructorParameter.addAfter(factory.createWhiteSpace(), constructorParameter.valOrVarKeyword!!) constructorParameter.addAfter(factory.createWhiteSpace(), constructorParameter.valOrVarKeyword!!)
constructorParameter.rename(property.name!!) constructorParameter.rename(property.name!!)
val propertyCommentSaver = CommentSaver(property, saveLineBreaks = true)
if (property.modifierList != null) { if (property.modifierList != null) {
val annotationEntries = constructorParameter.annotationEntries.map { it.copied() } val annotationEntries = constructorParameter.annotationEntries.map { it.copied() }
constructorParameter.setModifierList(property.modifierList!!) constructorParameter.setModifierList(property.modifierList!!)
@@ -93,6 +95,7 @@ class ConvertDataClass : NewJ2kPostProcessing {
} }
property.delete() property.delete()
statement.delete() statement.delete()
propertyCommentSaver.restore(constructorParameter, forceAdjustIndent = true)
} }
for (initBlock in element.getAnonymousInitializers()) { for (initBlock in element.getAnonymousInitializers()) {
if ((initBlock.body as KtBlockExpression).statements.isEmpty()) { if ((initBlock.body as KtBlockExpression).statements.isEmpty()) {