From c6e0356a59132de4e988a78b75d112a97488059a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 16 Sep 2019 20:10:25 +0300 Subject: [PATCH] Do not search for getter usages for every "may be const" quickfix invocation It is a rather expensive operation which is critical for j2k relates to #KT-33854 --- .../jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt index 2c299639b43..47dd0843662 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt @@ -100,16 +100,13 @@ object ConstFixFactory : KotlinSingleIntentionActionFactory() { fun replaceReferencesToGetterByReferenceToField(property: KtProperty) { val project = property.project - val getter = LightClassUtil.getLightClassPropertyMethods(property).getter + val getter = LightClassUtil.getLightClassPropertyMethods(property).getter ?: return val javaScope = GlobalSearchScope.getScopeRestrictedByFileTypes(project.allScope(), JavaFileType.INSTANCE) - val getterUsages = if (getter != null) - ReferencesSearch.search(getter, javaScope).findAll() - else - emptyList() val backingField = LightClassUtil.getLightClassPropertyMethods(property).backingField if (backingField != null) { + val getterUsages = ReferencesSearch.search(getter, javaScope).findAll() val factory = PsiElementFactory.SERVICE.getInstance(project) val fieldFQName = backingField.containingClass!!.qualifiedName + "." + backingField.name