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

DeprecatedSymbolUsageFix: renamed local

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-22 21:50:40 +03:00
parent e767cdef83
commit ee681cbeed
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt
+4 -4
View File
@@ -134,14 +134,14 @@ public abstract class DeprecatedSymbolUsageFixBase(
val callExpression = resolvedCall.getCall().getCallElement() as JetExpression val callExpression = resolvedCall.getCall().getCallElement() as JetExpression
val qualifiedExpression = callExpression.getParent() as? JetQualifiedExpression val qualifiedExpression = callExpression.getParent() as? JetQualifiedExpression
val expressionToReplace = qualifiedExpression ?: callExpression val expressionToBeReplaced = qualifiedExpression ?: callExpression
var receiver = element.getReceiverExpression()?.marked(USER_CODE_KEY) var receiver = element.getReceiverExpression()?.marked(USER_CODE_KEY)
var receiverType = if (receiver != null) bindingContext.getType(receiver) else null var receiverType = if (receiver != null) bindingContext.getType(receiver) else null
if (receiver == null) { if (receiver == null) {
val receiverValue = if (descriptor.isExtension) resolvedCall.getExtensionReceiver() else resolvedCall.getDispatchReceiver() val receiverValue = if (descriptor.isExtension) resolvedCall.getExtensionReceiver() else resolvedCall.getDispatchReceiver()
val resolutionScope = bindingContext[BindingContext.RESOLUTION_SCOPE, expressionToReplace] val resolutionScope = bindingContext[BindingContext.RESOLUTION_SCOPE, expressionToBeReplaced]
if (receiverValue is ThisReceiver && resolutionScope != null) { if (receiverValue is ThisReceiver && resolutionScope != null) {
receiver = receiverValue.asExpression(resolutionScope, psiFactory) receiver = receiverValue.asExpression(resolutionScope, psiFactory)
receiverType = receiverValue.getType() receiverType = receiverValue.getType()
@@ -195,7 +195,7 @@ public abstract class DeprecatedSymbolUsageFixBase(
unwrapDefaultValues(replacement.expression) unwrapDefaultValues(replacement.expression)
val wrapper = ConstructedExpressionWrapper(replacement.expression, expressionToReplace, bindingContext) val wrapper = ConstructedExpressionWrapper(replacement.expression, expressionToBeReplaced, bindingContext)
if (qualifiedExpression is JetSafeQualifiedExpression) { if (qualifiedExpression is JetSafeQualifiedExpression) {
wrapper.wrapExpressionForSafeCall(receiver!!, receiverType) wrapper.wrapExpressionForSafeCall(receiver!!, receiverType)
@@ -216,7 +216,7 @@ public abstract class DeprecatedSymbolUsageFixBase(
wrapper.introduceValue(value, valueType, usagesReplaced, nameSuggestion = parameter.getName().asString()) wrapper.introduceValue(value, valueType, usagesReplaced, nameSuggestion = parameter.getName().asString())
} }
var result = expressionToReplace.replace(wrapper.expression) as JetExpression var result = expressionToBeReplaced.replace(wrapper.expression) as JetExpression
//TODO: drop import of old function (if not needed anymore)? //TODO: drop import of old function (if not needed anymore)?