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

Move property to constructor preserves vararg keyword (#1095)

Browse Source 
#KT-18035 Fixed
This commit is contained in:
nd
2017-05-24 14:58:30 +02:00
committed by Dmitry Jemerov
parent 965b4199f4
commit 8d6d228bb8
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/MovePropertyToConstructorIntention.kt
+2
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
import org.jetbrains.kotlin.idea.util.CommentSaver
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
import org.jetbrains.kotlin.lexer.KtTokens.VARARG_KEYWORD
import org.jetbrains.kotlin.lexer.KtTokens.LATEINIT_KEYWORD
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -86,6 +87,7 @@ class MovePropertyToConstructorIntention :
element.modifierList?.getModifiersText()?.let(this::append)
propertyAnnotationsText?.takeIf(String::isNotBlank)?.let { appendWithSpaceBefore(it) }
parameterAnnotationsText?.let { appendWithSpaceBefore(it) }
if (constructorParameter.isVarArg) appendWithSpaceBefore(VARARG_KEYWORD.value)
appendWithSpaceBefore(element.valOrVarKeyword.text)
element.name?.let { appendWithSpaceBefore(it) }
constructorParameter.typeReference?.text?.let { append(": $it") }