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

Add modifiers on the same line even after annotation #KT-26492 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-08-30 14:37:16 +03:00
parent 4dd95e5640
commit 53e7778078
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+8 -2
View File
@@ -88,14 +88,20 @@ internal fun addModifier(modifierList: KtModifierList, modifier: KtModifierKeywo
fun placeAfter(child: PsiElement): Boolean {
if (child is PsiWhiteSpace) return false
if (child is KtAnnotation) return true // place modifiers after annotations
if (child is KtAnnotation || child is KtAnnotationEntry) return true // place modifiers after annotations
val elementType = child.node!!.elementType
val order = MODIFIERS_ORDER.indexOf(elementType)
return newModifierOrder > order
}
val lastChild = modifierList.lastChild
val anchor = lastChild?.siblings(forward = false)?.firstOrNull(::placeAfter)
val anchor = lastChild?.siblings(forward = false)?.firstOrNull(::placeAfter).let {
when {
it?.nextSibling is PsiWhiteSpace && (it is KtAnnotation || it is KtAnnotationEntry) -> it.nextSibling
it == null && modifierList.firstChild is PsiWhiteSpace -> modifierList.firstChild
else -> it
}
}
modifierList.addAfter(newModifier, anchor)
if (anchor == lastChild) { // add line break if needed, otherwise visibility keyword may appear on previous line