diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt index 3214abef63b..9510beea01c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt @@ -55,14 +55,13 @@ class CanBeParameterInspection : AbstractKotlinInspection() { var parameterUser: PsiElement = nameExpression do { parameterUser = PsiTreeUtil.getParentOfType(parameterUser, KtProperty::class.java, KtPropertyAccessor::class.java, - KtClassInitializer::class.java, KtSecondaryConstructor::class.java, + KtClassInitializer::class.java, KtFunction::class.java, KtObjectDeclaration::class.java, KtSuperTypeCallEntry::class.java) ?: return true } while (parameterUser is KtProperty && parameterUser.isLocal) return when (parameterUser) { is KtProperty -> parameterUser.containingClassOrObject !== klass is KtClassInitializer -> parameterUser.containingDeclaration !== klass - is KtSecondaryConstructor -> parameterUser.getContainingClassOrObject() !== klass is KtFunction, is KtObjectDeclaration, is KtPropertyAccessor -> true is KtSuperTypeCallEntry -> parameterUser.getStrictParentOfType() !== klass else -> true diff --git a/idea/testData/inspections/canBeParameter/inspectionData/expected.xml b/idea/testData/inspections/canBeParameter/inspectionData/expected.xml index 0c87b57473c..c0299b973a3 100644 --- a/idea/testData/inspections/canBeParameter/inspectionData/expected.xml +++ b/idea/testData/inspections/canBeParameter/inspectionData/expected.xml @@ -15,14 +15,6 @@ Constructor parameter is never used as a property Constructor parameter is never used as a property - - test.kt - 16 - light_idea_test_case - - Constructor parameter is never used as a property - Constructor parameter is never used as a property - test.kt 52 diff --git a/idea/testData/inspections/canBeParameter/test.kt b/idea/testData/inspections/canBeParameter/test.kt index 0d1d3b6a136..b08515f4daf 100644 --- a/idea/testData/inspections/canBeParameter/test.kt +++ b/idea/testData/inspections/canBeParameter/test.kt @@ -12,7 +12,7 @@ class UsedInInitializer(val x: Int) { y = x } } -// YES +// NO! class UsedInConstructor(val x: Int) { fun foo(arg: Int) = arg