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

Do not suggest "create abstract property" inside annotation

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-08-15 16:12:33 +03:00
parent 04675b4446
commit 9a9e703e80
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromCallActionFactory.kt
+2 -3
View File
@@ -149,10 +149,9 @@ sealed class CreateCallableFromCallActionFactory<E : KtExpression>(
if (originalReceiverTypeInfo !is TypeInfo.ByType) return null if (originalReceiverTypeInfo !is TypeInfo.ByType) return null
receiverTypeInfo = originalReceiverTypeInfo receiverTypeInfo = originalReceiverTypeInfo
receiverType = receiverTypeInfo.theType receiverType = receiverTypeInfo.theType
} } else {
else {
val containingClass = originalExpression.getStrictParentOfType<KtClassOrObject>() as? KtClass ?: return null val containingClass = originalExpression.getStrictParentOfType<KtClassOrObject>() as? KtClass ?: return null
if (containingClass is KtEnumEntry) return null if (containingClass is KtEnumEntry || containingClass.isAnnotation()) return null
receiverType = (containingClass.unsafeResolveToDescriptor() as ClassDescriptor).defaultType receiverType = (containingClass.unsafeResolveToDescriptor() as ClassDescriptor).defaultType
receiverTypeInfo = TypeInfo(receiverType, Variance.IN_VARIANCE).ofThis() receiverTypeInfo = TypeInfo(receiverType, Variance.IN_VARIANCE).ofThis()
} }
idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAnnotation.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// "Create local variable 'defaultPreferencesName'" "false" // "Create local variable 'defaultPreferencesName'" "false"
// ACTION: Create abstract property 'defaultPreferencesName'
// ACTION: Create parameter 'defaultPreferencesName' // ACTION: Create parameter 'defaultPreferencesName'
// ACTION: Create property 'defaultPreferencesName' // ACTION: Create property 'defaultPreferencesName'
// ACTION: Rename reference // ACTION: Rename reference