Fix 191 compilation due to changes in findReferences
Relates to #KT-37801
This commit is contained in:
+2
-4
@@ -23,8 +23,6 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
|
|||||||
import org.jetbrains.kotlin.idea.references.mainReference
|
import org.jetbrains.kotlin.idea.references.mainReference
|
||||||
import org.jetbrains.kotlin.idea.references.readWriteAccess
|
import org.jetbrains.kotlin.idea.references.readWriteAccess
|
||||||
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
|
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.CommentSaver
|
||||||
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
|
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
@@ -201,9 +199,9 @@ private class ConvertGettersAndSettersToPropertyStatefulProcessing(
|
|||||||
|
|
||||||
private fun KtParameter.rename(newName: String) {
|
private fun KtParameter.rename(newName: String) {
|
||||||
val renamer = RenamePsiElementProcessor.forElement(this)
|
val renamer = RenamePsiElementProcessor.forElement(this)
|
||||||
val searchScope = this.project.projectScope() or this.useScope
|
val findReferences = findReferences(renamer)
|
||||||
val usageInfos =
|
val usageInfos =
|
||||||
renamer.findReferences(this, searchScope, false).mapNotNull { reference ->
|
findReferences.mapNotNull { reference ->
|
||||||
val element = reference.element
|
val element = reference.element
|
||||||
val isBackingField = element is KtNameReferenceExpression &&
|
val isBackingField = element is KtNameReferenceExpression &&
|
||||||
element.text == KtTokens.FIELD_KEYWORD.value
|
element.text == KtTokens.FIELD_KEYWORD.value
|
||||||
|
|||||||
@@ -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<PsiReference> {
|
||||||
|
val searchScope = this.project.projectScope() or this.useScope
|
||||||
|
return renamer.findReferences(this, searchScope, false)
|
||||||
|
}
|
||||||
+16
@@ -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<PsiReference> {
|
||||||
|
return renamer.findReferences(this, false)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user