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

Extraction Engine: Skip containers enclosing object declaration (aside of other object declarations and containing file)

Browse Source
This commit is contained in:
Alexey Sedunov
2015-09-11 15:03:23 +03:00
parent 34b279a7a8
commit b80720209e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+12 -5
View File
@@ -137,13 +137,20 @@ public inline fun JetFile.createTempCopy(textTransform: (String) -> String): Jet
public fun PsiElement.getAllExtractionContainers(strict: Boolean = true): List<JetElement> { public fun PsiElement.getAllExtractionContainers(strict: Boolean = true): List<JetElement> {
val containers = ArrayList<JetElement>() val containers = ArrayList<JetElement>()
var element: PsiElement? = if (strict) getParent() else this var objectFound = false
while (element != null) { val parents = if (strict) parents else parentsWithSelf
when (element) { for (element in parents) {
is JetBlockExpression, is JetClassBody, is JetFile -> containers.add(element as JetElement) val isValidContainer = when (element) {
is JetFile -> true
is JetClassBody -> !objectFound || element.parent is JetObjectDeclaration
is JetBlockExpression -> !objectFound
else -> false
} }
if (!isValidContainer) continue
element = element.getParent() containers.add(element as JetElement)
((element as? JetClassBody)?.parent as? JetObjectDeclaration)?.let { objectFound = true }
} }
return containers return containers