From a0618d8e8270ba2b486d6daab382f0905cfdaf04 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Mon, 27 Mar 2017 14:42:16 +0300
Subject: [PATCH] EA-98482 - IAE: CaretModelImpl.$$$reportNull$$$

---
 .../codeInsight/hint/ParameterInfoController.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
index 7e3c95f0c574..dcad40ef8587 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
@@ -143,10 +143,6 @@ public class ParameterInfoController implements Disposable {
     myHint.setSelectingHint(true);
     myComponent.setParameterOwner(parameterOwner);
     myComponent.setHighlightedParameter(highlighted);
-    myComponent.update(); // to have correct preferred size
-    if (showHint) {
-      showHint(requestFocus);
-    }
 
     List<ParameterInfoController> allControllers = getAllControllers(myEditor);
     allControllers.add(this);
@@ -187,11 +183,15 @@ public class ParameterInfoController implements Disposable {
       }
     };
     LookupManager.getInstance(project).addPropertyChangeListener(lookupListener, this);
-
-    updateComponent();
     if (myEditor instanceof EditorImpl) {
       Disposer.register(((EditorImpl)myEditor).getDisposable(), this);
     }
+
+    myComponent.update(); // to have correct preferred size
+    if (showHint) {
+      showHint(requestFocus);
+    }
+    updateComponent();
   }
 
   @Override