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

Minor code simplification

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-22 11:52:29 +03:00
parent be9a3d10f6
commit 36f41c6d13
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt
+26 -33
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.name.FqNameUnsafe
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.kotlin.psi.psiUtil.replaced
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -99,41 +100,35 @@ object ReplaceWithAnnotationAnalyzer {
val parameterUsageKey = Key<ValueParameterDescriptor>("parameterUsageKey") val parameterUsageKey = Key<ValueParameterDescriptor>("parameterUsageKey")
expression.accept(object : JetVisitorVoid(){ expression.forEachDescendantOfType<JetSimpleNameExpression> { expression ->
override fun visitSimpleNameExpression(expression: JetSimpleNameExpression) { val target = bindingContext[BindingContext.REFERENCE_TARGET, expression] ?: return@forEachDescendantOfType
val target = bindingContext[BindingContext.REFERENCE_TARGET, expression] ?: return
if (target.canBeReferencedViaImport()) { if (target.canBeReferencedViaImport()) {
if (target.isExtension || expression.getReceiverExpression() == null) { if (target.isExtension || expression.getReceiverExpression() == null) {
importFqNames.addIfNotNull(target.importableFqName) importFqNames.addIfNotNull(target.importableFqName)
} }
}
if (expression.getReceiverExpression() == null) {
if (target is ValueParameterDescriptor && target.getContainingDeclaration() == symbolDescriptor) {
expression.putCopyableUserData(parameterUsageKey, target)
} }
if (expression.getReceiverExpression() == null) { val resolvedCall = expression.getResolvedCall(bindingContext)
if (target is ValueParameterDescriptor && target.getContainingDeclaration() == symbolDescriptor) { if (resolvedCall != null && resolvedCall.getStatus().isSuccess()) {
expression.putCopyableUserData(parameterUsageKey, target) val receiver = if (resolvedCall.getResultingDescriptor().isExtension)
} resolvedCall.getExtensionReceiver()
else
val resolvedCall = expression.getResolvedCall(bindingContext) resolvedCall.getDispatchReceiver()
if (resolvedCall != null && resolvedCall.getStatus().isSuccess()) { if (receiver is ThisReceiver) {
val receiver = if (resolvedCall.getResultingDescriptor().isExtension) val receiverExpression = receiver.asExpression(symbolScope, psiFactory)
resolvedCall.getExtensionReceiver() if (receiverExpression != null) {
else receiversToAdd.add(expression to receiverExpression)
resolvedCall.getDispatchReceiver()
if (receiver is ThisReceiver) {
val receiverExpression = receiver.asExpression(symbolScope, psiFactory)
if (receiverExpression != null) {
receiversToAdd.add(expression to receiverExpression)
}
} }
} }
} }
} }
}
override fun visitJetElement(element: JetElement) {
element.acceptChildren(this)
}
})
for ((expr, receiverExpression) in receiversToAdd) { for ((expr, receiverExpression) in receiversToAdd) {
val expressionToReplace = expr.getParent() as? JetCallExpression ?: expr val expressionToReplace = expr.getParent() as? JetCallExpression ?: expr
@@ -147,11 +142,9 @@ object ReplaceWithAnnotationAnalyzer {
.map { parameter -> parameter to expression.collectDescendantsOfType<JetExpression> { it.getCopyableUserData(parameterUsageKey) == parameter } } .map { parameter -> parameter to expression.collectDescendantsOfType<JetExpression> { it.getCopyableUserData(parameterUsageKey) == parameter } }
.toMap() .toMap()
expression.accept(object : PsiRecursiveElementVisitor() { expression.forEachDescendantOfType<JetExpression> {
override fun visitElement(element: PsiElement) { it.putCopyableUserData(parameterUsageKey, null)
element.putCopyableUserData(parameterUsageKey, null) }
}
})
return ReplacementExpression(expression, importFqNames, parameterUsages) return ReplacementExpression(expression, importFqNames, parameterUsages)
} }