diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt index 771d4eaa772..f60490aa34c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt @@ -36,7 +36,7 @@ public interface KtReference : PsiPolyVariantReference { override fun getElement(): KtElement } -public abstract class AbstractJetReference(element: T) +public abstract class AbstractKtReference(element: T) : PsiPolyVariantReferenceBase(element), KtReference { public val expression: T @@ -120,8 +120,8 @@ public abstract class AbstractJetReference(element: T) override fun toString() = javaClass.getSimpleName() + ": " + expression.getText() } -public abstract class KtSimpleReference(expression: T) : AbstractJetReference(expression) { +public abstract class KtSimpleReference(expression: T) : AbstractKtReference(expression) { override fun getTargetDescriptors(context: BindingContext) = expression.getReferenceTargets(context) } -public abstract class KtMultiReference(expression: T) : AbstractJetReference(expression) +public abstract class KtMultiReference(expression: T) : AbstractKtReference(expression) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt index 2ac57d2194f..6fdbd6d1a0c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt @@ -120,7 +120,7 @@ private fun PsiElement.isConstructorOf(unwrappedCandidate: PsiElement) = // call to Kotlin constructor (this is KtConstructor<*> && getContainingClassOrObject() == unwrappedCandidate) -fun AbstractJetReference.renameImplicitConventionalCall(newName: String?): KtExpression { +fun AbstractKtReference.renameImplicitConventionalCall(newName: String?): KtExpression { if (newName == null) return expression val (newExpression, newNameElement) = OperatorToFunctionIntention.convert(expression) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt index 8e6dd3e29c1..30791a95519 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt @@ -23,7 +23,7 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle -import org.jetbrains.kotlin.idea.references.AbstractJetReference +import org.jetbrains.kotlin.idea.references.AbstractKtReference import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtNamedDeclaration import java.util.* @@ -34,7 +34,7 @@ fun checkConflictsAndReplaceUsageInfos(result: MutableList) { for (usageInfo in result) { val ref = usageInfo.getReference() - if (usageInfo !is MoveRenameUsageInfo || ref !is AbstractJetReference<*> || ref.canRename()) continue + if (usageInfo !is MoveRenameUsageInfo || ref !is AbstractKtReference<*> || ref.canRename()) continue val refElement = usageInfo.getElement() val referencedElement = usageInfo.getReferencedElement()