MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jvm-lang] updateMethodParametersRequest made using java functional interfaces instead of Kotlin functions (IDEA-CR-45428)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2019-03-26 14:59:56 +03:00
parent 60cfdf4b6a
commit df9600f711
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-api/src/com/intellij/lang/jvm/actions/methodRequests.kt
+9 -7
View File
@@ -10,6 +10,8 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiJvmSubstitutor
import com.intellij.psi.PsiSubstitutor
import com.intellij.psi.PsiType
import java.util.function.Function
import java.util.function.Supplier
import com.intellij.openapi.util.Pair as JBPair
private class SimpleMethodRequest(
@@ -57,8 +59,8 @@ fun constructorRequest(project: Project, parameters: List<JBPair<String, PsiType
fun setMethodParametersRequest(parameters: Iterable<Map.Entry<String, JvmType>>): ChangeParametersRequest =
SimpleChangeParametersRequest(parameters.map { expectedParameter(it.value, it.key) })
fun updateMethodParametersRequest(parametersOwnerPointer: () -> JvmMethod?,
updateFunction: (List<ExpectedParameter>) -> List<ExpectedParameter>): ChangeParametersRequest =
fun updateMethodParametersRequest(parametersOwnerPointer: Supplier<JvmMethod?>,
updateFunction: Function<List<ExpectedParameter>, List<ExpectedParameter>>): ChangeParametersRequest =
UpdateParametersRequest(parametersOwnerPointer, updateFunction)
private class SimpleChangeParametersRequest(private val parameters: List<ExpectedParameter>) : ChangeParametersRequest {
@@ -68,15 +70,15 @@ private class SimpleChangeParametersRequest(private val parameters: List<Expecte
}
private class UpdateParametersRequest(val parametersOwnerPointer: () -> JvmMethod?,
val updateFunction: (List<ExpectedParameter>) -> List<ExpectedParameter>) : ChangeParametersRequest {
private class UpdateParametersRequest(val parametersOwnerPointer: Supplier<JvmMethod?>,
val updateFunction: Function<List<ExpectedParameter>, List<ExpectedParameter>>) : ChangeParametersRequest {
override fun getExpectedParameters(): List<ExpectedParameter> {
val jvmMethod = parametersOwnerPointer()
val jvmMethod = parametersOwnerPointer.get()
?: throw IllegalStateException("parametersOwnerPointer is invalid, please check isValid() before calling this method")
return updateFunction(jvmMethod.parameters.map { ChangeParametersRequest.ExistingParameterWrapper(it) })
return updateFunction.apply(jvmMethod.parameters.map { ChangeParametersRequest.ExistingParameterWrapper(it) })
}
override fun isValid(): Boolean = parametersOwnerPointer() != null
override fun isValid(): Boolean = parametersOwnerPointer.get() != null
}