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

Remove write action from refactoring start (KT-11486)

Browse Source 
#KT-11486 Fixed
This commit is contained in:
Nikolay Krasko
2016-05-06 22:29:36 +03:00
parent 5c1e5b3cdc
commit ab79deacbd
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+37 -38
View File
@@ -134,48 +134,47 @@ fun getParametersToRemove(
}
fun IntroduceParameterDescriptor.performRefactoring() {
runWriteAction {
val config = object : KotlinChangeSignatureConfiguration {
override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor {
return originalDescriptor.modify { methodDescriptor ->
if (!withDefaultValue) {
val parameters = callable.getValueParameters()
val withReceiver = methodDescriptor.receiver != null
parametersToRemove
.map {
if (it is KtParameter) {
parameters.indexOf(it) + if (withReceiver) 1 else 0
} else 0
}
.sortedDescending()
.forEach { methodDescriptor.removeParameter(it) }
}
val defaultValue = if (newArgumentValue is KtProperty) (newArgumentValue as KtProperty).initializer else newArgumentValue
val parameterInfo = KotlinParameterInfo(callableDescriptor = callableDescriptor,
name = newParameterName,
defaultValueForCall = if (withDefaultValue) null else defaultValue,
defaultValueForParameter = if (withDefaultValue) defaultValue else null,
valOrVar = valVar)
parameterInfo.currentTypeInfo = KotlinTypeInfo(false, null, newParameterTypeText)
methodDescriptor.addParameter(parameterInfo)
val config = object : KotlinChangeSignatureConfiguration {
override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor {
return originalDescriptor.modify { methodDescriptor ->
if (!withDefaultValue) {
val parameters = callable.getValueParameters()
val withReceiver = methodDescriptor.receiver != null
parametersToRemove
.map {
if (it is KtParameter) {
parameters.indexOf(it) + if (withReceiver) 1 else 0
} else 0
}
.sortedDescending()
.forEach { methodDescriptor.removeParameter(it) }
}
}
override fun performSilently(affectedFunctions: Collection<PsiElement>): Boolean = true
val defaultValue = if (newArgumentValue is KtProperty) (newArgumentValue as KtProperty).initializer else newArgumentValue
val parameterInfo = KotlinParameterInfo(callableDescriptor = callableDescriptor,
name = newParameterName,
defaultValueForCall = if (withDefaultValue) null else defaultValue,
defaultValueForParameter = if (withDefaultValue) defaultValue else null,
valOrVar = valVar)
parameterInfo.currentTypeInfo = KotlinTypeInfo(false, null, newParameterTypeText)
methodDescriptor.addParameter(parameterInfo)
}
}
val project = callable.project
val changeSignature = { runChangeSignature(project, callableDescriptor, config, callable, INTRODUCE_PARAMETER) }
changeSignature.runRefactoringWithPostprocessing(project, "refactoring.changeSignature") {
try {
occurrencesToReplace.forEach { occurrenceReplacer(it) }
}
finally {
project.messageBus
.syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringDone(INTRODUCE_PARAMETER_REFACTORING_ID, null)
}
override fun performSilently(affectedFunctions: Collection<PsiElement>): Boolean = true
}
val project = callable.project
val changeSignature = { runChangeSignature(project, callableDescriptor, config, callable, INTRODUCE_PARAMETER) }
changeSignature.runRefactoringWithPostprocessing(project, "refactoring.changeSignature") {
try {
occurrencesToReplace.forEach { occurrenceReplacer(it) }
}
finally {
project.messageBus
.syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringDone(INTRODUCE_PARAMETER_REFACTORING_ID, null)
}
}
}