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

Change Signature: Do not use local declaration as a context for a type code fragment

Browse Source
This commit is contained in:
Alexey Sedunov
2016-04-27 15:44:33 +03:00
parent c6cb5175a4
commit e6ab2f1c2d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt
+7 -6
View File
@@ -408,12 +408,13 @@ class KotlinChangeSignatureDialog(
private fun getTypeCodeFragmentContext(startFrom: PsiElement): KtElement { private fun getTypeCodeFragmentContext(startFrom: PsiElement): KtElement {
return startFrom.parents.mapNotNull { return startFrom.parents.mapNotNull {
when (it) { when {
is KtNamedFunction -> it.bodyExpression it is KtNamedFunction -> it.bodyExpression
is KtPropertyAccessor -> it.bodyExpression it is KtPropertyAccessor -> it.bodyExpression
is KtConstructor<*> -> it it is KtDeclaration && KtPsiUtil.isLocal(it) -> null
is KtClassOrObject -> it it is KtConstructor<*> -> it
is KtFile -> it it is KtClassOrObject -> it
it is KtFile -> it
else -> null else -> null
} }
}.first() }.first()