azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AbstractJetReference -> AbstractKtReference

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-20 18:15:40 +01:00
parent bfca85db52
commit 6adfb96154
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+3 -3
View File
@@ -36,7 +36,7 @@ public interface KtReference : PsiPolyVariantReference {
override fun getElement(): KtElement override fun getElement(): KtElement
} }
public abstract class AbstractJetReference<T : KtElement>(element: T) public abstract class AbstractKtReference<T : KtElement>(element: T)
: PsiPolyVariantReferenceBase<T>(element), KtReference { : PsiPolyVariantReferenceBase<T>(element), KtReference {
public val expression: T public val expression: T
@@ -120,8 +120,8 @@ public abstract class AbstractJetReference<T : KtElement>(element: T)
override fun toString() = javaClass.getSimpleName() + ": " + expression.getText() override fun toString() = javaClass.getSimpleName() + ": " + expression.getText()
} }
public abstract class KtSimpleReference<T : KtReferenceExpression>(expression: T) : AbstractJetReference<T>(expression) { public abstract class KtSimpleReference<T : KtReferenceExpression>(expression: T) : AbstractKtReference<T>(expression) {
override fun getTargetDescriptors(context: BindingContext) = expression.getReferenceTargets(context) override fun getTargetDescriptors(context: BindingContext) = expression.getReferenceTargets(context)
} }
public abstract class KtMultiReference<T : KtElement>(expression: T) : AbstractJetReference<T>(expression) public abstract class KtMultiReference<T : KtElement>(expression: T) : AbstractKtReference<T>(expression)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+1 -1
View File
@@ -120,7 +120,7 @@ private fun PsiElement.isConstructorOf(unwrappedCandidate: PsiElement) =
// call to Kotlin constructor // call to Kotlin constructor
(this is KtConstructor<*> && getContainingClassOrObject() == unwrappedCandidate) (this is KtConstructor<*> && getContainingClassOrObject() == unwrappedCandidate)
fun AbstractJetReference<out KtExpression>.renameImplicitConventionalCall(newName: String?): KtExpression { fun AbstractKtReference<out KtExpression>.renameImplicitConventionalCall(newName: String?): KtExpression {
if (newName == null) return expression if (newName == null) return expression
val (newExpression, newNameElement) = OperatorToFunctionIntention.convert(expression) val (newExpression, newNameElement) = OperatorToFunctionIntention.convert(expression)
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle 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.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtNamedDeclaration
import java.util.* import java.util.*
@@ -34,7 +34,7 @@ fun checkConflictsAndReplaceUsageInfos(result: MutableList<UsageInfo>) {
for (usageInfo in result) { for (usageInfo in result) {
val ref = usageInfo.getReference() 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 refElement = usageInfo.getElement()
val referencedElement = usageInfo.getReferencedElement() val referencedElement = usageInfo.getReferencedElement()