From bf1448a73d94f2c663bdcb97fb715fabceb60858 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 27 Sep 2018 17:53:35 +0300 Subject: [PATCH] [groovy] add null check (EA-128166) --- .../groovy/lang/resolve/delegatesTo/grDelegatesToUtil.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/delegatesTo/grDelegatesToUtil.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/delegatesTo/grDelegatesToUtil.kt index 6cea66684b4b..45132820d84e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/delegatesTo/grDelegatesToUtil.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/delegatesTo/grDelegatesToUtil.kt @@ -64,6 +64,13 @@ private fun doResolveActualCall(call: GrMethodCall): GroovyResolveResult { val expression = call.invokedExpression val type = expression.type ?: return result - val calls = ResolveUtil.getMethodCandidates(type, "call", expression, *getArgumentTypes(expression, false)) + val argumentTypes = getArgumentTypes(expression, false) + // work around KT-27229 + val calls = if (argumentTypes == null) { + ResolveUtil.getMethodCandidates(type, "call", expression, null) + } + else { + ResolveUtil.getMethodCandidates(type, "call", expression, *argumentTypes) + } return calls.singleOrNull() ?: EmptyGroovyResolveResult }