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

Refactored PsiElement.parents() into 2 properties

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
+4 -3
View File
@@ -26,6 +26,7 @@ import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.idea.JetBundle
import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
public abstract class JetSelfTargetingIntention<TElement : JetElement>(
public val elementType: Class<TElement>,
@@ -55,13 +56,13 @@ public abstract class JetSelfTargetingIntention<TElement : JetElement>(
var elementsToCheck: Sequence<PsiElement> = sequence { null }
if (leaf1 != null) {
elementsToCheck += leaf1.parents().takeWhile { it != commonParent }
elementsToCheck += leaf1.parentsWithSelf.takeWhile { it != commonParent }
}
if (leaf2 != null) {
elementsToCheck += leaf2.parents().takeWhile { it != commonParent }
elementsToCheck += leaf2.parentsWithSelf.takeWhile { it != commonParent }
}
if (commonParent != null) {
elementsToCheck += commonParent.parents()
elementsToCheck += commonParent.parentsWithSelf
}
val elementsOfType = elementsToCheck.filterIsInstance(elementType)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+1 -1
View File
@@ -183,7 +183,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
val elementSet = elements.toSet()
val newElements = LinkedHashSet<JetElement>(elementSet.size())
for (element in elementSet) {
if (!element.parents(withItself = false).any { it in elementSet }) {
if (!element.parents.any { it in elementSet }) {
newElements.add(element)
}
}