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

New J2K: fix wrong psi modification in ConvertDataClass

Browse Source
This commit is contained in:
Ilya Kirillov
2019-04-22 14:30:09 +03:00
parent f11311a20b
commit 1ffe07bb6c
1 changed files with 3 additions and 7 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 -7
View File
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.LocalSearchScope
import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.search.searches.ReferencesSearch
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
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.idea.util.CommentSaver
@@ -76,13 +75,10 @@ class ConvertDataClass : NewJ2kPostProcessing {
constructorParameter.rename(property.name!!) constructorParameter.rename(property.name!!)
val propertyCommentSaver = CommentSaver(property, saveLineBreaks = true) val propertyCommentSaver = CommentSaver(property, saveLineBreaks = true)
if (property.modifierList != null) { if (property.modifierList != null) {
val annotationEntries = constructorParameter.annotationEntries.map { it.copied() }
constructorParameter.setModifierList(property.modifierList!!) constructorParameter.setModifierList(property.modifierList!!)
constructorParameter.annotationEntries.forEach { it.delete() } constructorParameter.annotationEntries.forEach { it.delete() }
for (annotationEntry in annotationEntries) { for (entry in constructorParameter.annotationEntries) {
constructorParameter.addAnnotationEntry(annotationEntry).also { entry -> entry.addUseSiteTarget(AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER, element.project)
entry.addUseSiteTarget(AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER, element.project)
}
} }
} }
@@ -95,7 +91,7 @@ class ConvertDataClass : NewJ2kPostProcessing {
} }
property.delete() property.delete()
statement.delete() statement.delete()
propertyCommentSaver.restore(constructorParameter, forceAdjustIndent = true) propertyCommentSaver.restore(constructorParameter, forceAdjustIndent = false)
} }
for (initBlock in element.getAnonymousInitializers()) { for (initBlock in element.getAnonymousInitializers()) {
if ((initBlock.body as KtBlockExpression).statements.isEmpty()) { if ((initBlock.body as KtBlockExpression).statements.isEmpty()) {