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

AddConstModifierIntention: handle more edge cases #KT-13173 Fixed

Browse Source 
(cherry picked from commit 4755596)
This commit is contained in:
Kirill Rakhman
2016-07-21 19:39:41 +03:00
committed by Mikhail Glukhikh
parent adbb07f30b
commit 5948b69679
8 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
+8 -1
View File
@@ -31,7 +31,10 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.intentions.SelfTargetingIntention
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
import org.jetbrains.kotlin.idea.util.findAnnotation
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.KtReferenceExpression
@@ -47,9 +50,12 @@ class AddConstModifierFix(val property: KtProperty) : AddModifierFix(property, K
}
companion object {
private val removeAnnotations = listOf(FqName("kotlin.jvm.JvmStatic"), FqName("kotlin.jvm.JvmField"))
fun addConstModifier(property: KtProperty) {
replaceReferencesToGetterByReferenceToField(property)
property.addModifier(KtTokens.CONST_KEYWORD)
removeAnnotations.mapNotNull { property.findAnnotation(it) }.forEach(KtAnnotationEntry::delete)
}
}
}
@@ -66,7 +72,8 @@ class AddConstModifierIntention : SelfTargetingIntention<KtProperty>(KtProperty:
companion object {
fun isApplicableTo(element: KtProperty): Boolean {
if (element.isLocal || element.isVar || element.hasDelegate() || element.initializer == null
|| element.getter?.hasBody() == true || element.receiverTypeReference != null) {
|| element.getter?.hasBody() == true || element.receiverTypeReference != null
|| element.hasModifier(KtTokens.CONST_KEYWORD) || element.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
return false
}
val propertyDescriptor = element.descriptor as? VariableDescriptor ?: return false