diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt index 226d5d0c63e..a9c3fb0194c 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt @@ -23,8 +23,6 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.readWriteAccess import org.jetbrains.kotlin.idea.resolve.ResolutionFacade -import org.jetbrains.kotlin.idea.search.or -import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.util.CommentSaver import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -201,9 +199,9 @@ private class ConvertGettersAndSettersToPropertyStatefulProcessing( private fun KtParameter.rename(newName: String) { val renamer = RenamePsiElementProcessor.forElement(this) - val searchScope = this.project.projectScope() or this.useScope + val findReferences = findReferences(renamer) val usageInfos = - renamer.findReferences(this, searchScope, false).mapNotNull { reference -> + findReferences.mapNotNull { reference -> val element = reference.element val isBackingField = element is KtNameReferenceExpression && element.text == KtTokens.FIELD_KEYWORD.value diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt new file mode 100644 index 00000000000..606c57a59f2 --- /dev/null +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.nj2k.postProcessing.processings + +import com.intellij.psi.PsiReference +import com.intellij.refactoring.rename.RenamePsiElementProcessor +import org.jetbrains.kotlin.idea.search.or +import org.jetbrains.kotlin.idea.search.projectScope +import org.jetbrains.kotlin.psi.KtParameter + +// BUNCH: 191 + +internal fun KtParameter.findReferences(renamer: RenamePsiElementProcessor): MutableCollection { + val searchScope = this.project.projectScope() or this.useScope + return renamer.findReferences(this, searchScope, false) +} \ No newline at end of file diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 new file mode 100644 index 00000000000..a1b70c14816 --- /dev/null +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 @@ -0,0 +1,16 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.nj2k.postProcessing.processings + +import com.intellij.psi.PsiReference +import com.intellij.refactoring.rename.RenamePsiElementProcessor +import org.jetbrains.kotlin.psi.KtParameter + +// BUNCH: 191 + +internal fun KtParameter.findReferences(renamer: RenamePsiElementProcessor): MutableCollection { + return renamer.findReferences(this, false) +} \ No newline at end of file