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

Change Signature: Fix original method info for Java method used in Kotlin

Browse Source 
#KT-23714 Fixed
This commit is contained in:
Alexey Sedunov
2018-04-16 17:50:07 +03:00
parent 53a4baac8b
commit f69a807ae6
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt
+22 -8
View File
@@ -21,10 +21,7 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages
import com.intellij.psi.PsiElement import com.intellij.psi.*
import com.intellij.psi.PsiElementFactory
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiType
import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.refactoring.BaseRefactoringProcessor
import com.intellij.refactoring.changeSignature.* import com.intellij.refactoring.changeSignature.*
import com.intellij.refactoring.util.CanonicalTypes import com.intellij.refactoring.util.CanonicalTypes
@@ -118,11 +115,28 @@ class KotlinChangeSignature(
} }
val (preview, javaChangeInfo) = getPreviewInfoForJavaMethod(descriptor) val (preview, javaChangeInfo) = getPreviewInfoForJavaMethod(descriptor)
object: JavaChangeSignatureDialog(project, JavaMethodDescriptor(preview), false, null) { val javaDescriptor = object : JavaMethodDescriptor(preview) {
@Suppress("UNCHECKED_CAST")
override fun getParameters() = javaChangeInfo.newParameters.toMutableList() as MutableList<ParameterInfoImpl>
}
object: JavaChangeSignatureDialog(project, javaDescriptor, false, null) {
override fun createRefactoringProcessor(): BaseRefactoringProcessor? { override fun createRefactoringProcessor(): BaseRefactoringProcessor? {
val processor = super.createRefactoringProcessor() val parameters = parameters
(processor as? ChangeSignatureProcessor)?.changeInfo?.updateMethod(javaChangeInfo.method) LOG.assertTrue(myMethod.method.isValid)
return processor val newJavaChangeInfo = JavaChangeInfoImpl(
visibility ?: VisibilityUtil.getVisibilityModifier(myMethod.method.modifierList),
javaChangeInfo.method,
methodName,
returnType ?: CanonicalTypes.createTypeWrapper(PsiType.VOID),
parameters.toTypedArray(),
exceptions,
isGenerateDelegate,
myMethodsToPropagateParameters ?: HashSet(),
myMethodsToPropagateExceptions ?: HashSet()
).also {
it.setCheckUnusedParameter()
}
return ChangeSignatureProcessor(myProject, newJavaChangeInfo)
} }
} }
} }