jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-26 00:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 191 compilation due to changes in findReferences

Browse Source 
Relates to #KT-37801
This commit is contained in:
Vladimir Dolzhenko
2020-04-10 14:50:22 +02:00
parent d7226f4952
commit 936801d744
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt
View File

@@ -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

19
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt Normal file
View File

@@ -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
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/compat.kt.191 Normal file
View File

@@ -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)
}