From 1188e45f44a424b7eceff7645c85a8ce62482437 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 4 May 2018 11:20:25 +0200
Subject: [PATCH] when lookup is shown, display documentation only for lookup
 items

it's strange when doc popup is aligned to selected lookup item but shows doc for something else
even stranger if this happens automatically (IDEA-76223)
---
 .../documentation/DocumentationManager.java       | 15 +++++++++------
 .../intellij/ui/popup/PopupUpdateProcessor.java   |  7 ++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index 6acd64005450..0bec6edae770 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -4,6 +4,7 @@ package com.intellij.codeInsight.documentation;
 
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.TargetElementUtil;
+import com.intellij.codeInsight.completion.CompletionUtil;
 import com.intellij.codeInsight.documentation.actions.ShowQuickDocInfoAction;
 import com.intellij.codeInsight.hint.HintManagerImpl;
 import com.intellij.codeInsight.hint.ParameterInfoController;
@@ -614,9 +615,13 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
    */
   @Nullable
   private PsiElement findTargetElementUnsafe(final Editor editor, int offset, @Nullable final PsiFile file, PsiElement contextElement) {
+    if (LookupManager.getInstance(myProject).getActiveLookup() != null) {
+      return assertSameProject(getElementFromLookup(editor, file));
+    }
+
     TargetElementUtil util = TargetElementUtil.getInstance();
-    PsiElement element = assertSameProject(getElementFromLookup(editor, file));
-    if (element == null && file != null) {
+    PsiElement element = null;
+    if (file != null) {
       final DocumentationProvider documentationProvider = getProviderFromElement(file);
       if (documentationProvider instanceof DocumentationProviderEx) {
         element = assertSameProject(((DocumentationProviderEx)documentationProvider).getCustomDocumentationElement(editor, file, contextElement));
@@ -658,8 +663,6 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
     if (activeLookup != null) {
       LookupElement item = activeLookup.getCurrentItem();
       if (item != null) {
-
-
         int offset = editor.getCaretModel().getOffset();
         if (offset > 0 && offset == editor.getDocument().getTextLength()) offset--;
         PsiReference ref = TargetElementUtil.findReference(editor, offset);
@@ -670,9 +673,9 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
         }
 
         DocumentationProvider documentationProvider = getProviderFromElement(file);
-
         PsiManager psiManager = PsiManager.getInstance(myProject);
-        return documentationProvider.getDocumentationElementForLookupItem(psiManager, item.getObject(), targetElement);
+        PsiElement fromProvider = documentationProvider.getDocumentationElementForLookupItem(psiManager, item.getObject(), targetElement);
+        return fromProvider != null ? fromProvider : CompletionUtil.getTargetElement(item);
       }
     }
     return null;
diff --git a/platform/lang-impl/src/com/intellij/ui/popup/PopupUpdateProcessor.java b/platform/lang-impl/src/com/intellij/ui/popup/PopupUpdateProcessor.java
index d5b5bdf09194..e1fe077bd512 100644
--- a/platform/lang-impl/src/com/intellij/ui/popup/PopupUpdateProcessor.java
+++ b/platform/lang-impl/src/com/intellij/ui/popup/PopupUpdateProcessor.java
@@ -16,7 +16,6 @@
 
 package com.intellij.ui.popup;
 
-import com.intellij.codeInsight.completion.CompletionUtil;
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.codeInsight.lookup.*;
 import com.intellij.ide.util.gotoByName.ChooseByNameBase;
@@ -49,10 +48,8 @@ public abstract class PopupUpdateProcessor extends PopupUpdateProcessorBase {
           if (windowEvent.asPopup().isVisible()) { //was not canceled yet
             final LookupElement item = event.getItem();
             if (item != null) {
-              PsiElement targetElement = CompletionUtil.getTargetElement(item);
-              if (targetElement == null) {
-                targetElement = DocumentationManager.getInstance(myProject).getElementFromLookup(activeLookup.getEditor(), activeLookup.getPsiFile());
-              }
+              PsiElement targetElement =
+                DocumentationManager.getInstance(myProject).getElementFromLookup(activeLookup.getEditor(), activeLookup.getPsiFile());
 
               updatePopup(targetElement); //open next
             }