From 7014f5b23d4a2063b016959e7ff65a7f5552870b Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Wed, 18 Oct 2017 12:56:38 +0300
Subject: [PATCH] EA-109538 - CCE:
 MethodParameterInfoHandler.updateParameterInfo

---
 .../hint/api/impls/MethodParameterInfoHandler.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
index 0c5ea1c2a759..3cec310962c8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
@@ -327,9 +327,10 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc
       context.setHighlightedParameter(completeMatch);
     }
 
-    CandidateInfo resultingCandidate = (CandidateInfo)(candidates.length == 1 ? candidates[0] : context.getHighlightedParameter());
-    if (resultingCandidate != null) {
-      PsiMethod method = (PsiMethod)resultingCandidate.getElement();
+    Object highlightedCandidate = candidates.length == 1 ? candidates[0] : context.getHighlightedParameter();
+    if (highlightedCandidate != null) {
+      PsiMethod method = (PsiMethod)(highlightedCandidate instanceof CandidateInfo 
+                                     ? ((CandidateInfo)highlightedCandidate).getElement() : highlightedCandidate);
       if (!method.isVarArgs() && index >= method.getParameterList().getParametersCount()) context.setCurrentParameter(-1);
     }
   }