Refactored PsiElement.parents() into 2 properties

This commit is contained in:
Valentin Kipyatkov
2015-05-28 22:49:07 +03:00
parent 55f70d7d48
commit 494d96bbc7
26 changed files with 52 additions and 56 deletions
@@ -207,7 +207,7 @@ public class CommentSaver(originalElements: PsiChildRange, private val saveLineB
val token = original.findElementAt(element.getStartOffsetIn(createdElement) + rangeInOriginal.getStartOffset())
if (token != null) {
val elementLength = element.getTextLength()
for (originalElement in token.parents()) {
for (originalElement in token.parentsWithSelf) {
val length = originalElement.getTextLength()
if (length < elementLength) continue
if (length == elementLength) {
@@ -396,7 +396,7 @@ public class CommentSaver(originalElements: PsiChildRange, private val saveLineB
}
private fun PsiElement.anchorToAddCommentOrSpace(before: Boolean): PsiElement {
return parents()
return parentsWithSelf
.dropWhile { it.getParent() !is PsiFile && (if (before) it.getPrevSibling() else it.getNextSibling()) == null }
.first()
}