This commit is contained in:
Valentin Kipyatkov
2015-09-01 16:45:26 +03:00
parent c8c79c647f
commit d6c6c4db97
3 changed files with 3 additions and 3 deletions
@@ -49,7 +49,7 @@ public class DeprecatedSymbolUsageFix(
project: Project, project: Project,
editor: Editor? editor: Editor?
) { ) {
val result = performReplacement(element, bindingContext, resolvedCall, replacement) val result = performCallReplacement(element, bindingContext, resolvedCall, replacement)
val offset = (result.getCalleeExpressionIfAny() ?: result).textOffset val offset = (result.getCalleeExpressionIfAny() ?: result).textOffset
editor?.moveCaret(offset) editor?.moveCaret(offset)
@@ -116,7 +116,7 @@ public class DeprecatedSymbolUsageInWholeProjectFix(
val resolvedCall = usage.getResolvedCall(bindingContext) ?: continue val resolvedCall = usage.getResolvedCall(bindingContext) ?: continue
if (!resolvedCall.status.isSuccess) continue if (!resolvedCall.status.isSuccess) continue
// copy replacement expression because it is modified by performReplacement // copy replacement expression because it is modified by performReplacement
performReplacement(usage, bindingContext, resolvedCall, replacement.copy()) performCallReplacement(usage, bindingContext, resolvedCall, replacement.copy())
} }
catch (e: Throwable) { catch (e: Throwable) {
LOG.error(e) LOG.error(e)
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.* import java.util.*
fun performReplacement( fun performCallReplacement(
element: JetSimpleNameExpression, element: JetSimpleNameExpression,
bindingContext: BindingContext, bindingContext: BindingContext,
resolvedCall: ResolvedCall<out CallableDescriptor>, resolvedCall: ResolvedCall<out CallableDescriptor>,