From 8fbbb158de9a099bbcb2a2e602cbc7d2d59d6811 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 10 Nov 2010 21:59:44 +0300 Subject: [PATCH] don't show quick doc automatically in autopopup completion (IDEA-60080) --- .../codeInsight/lookup/impl/LookupManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java index bbab5fcab3b1..bd18aa1f081f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java @@ -17,6 +17,8 @@ package com.intellij.codeInsight.lookup.impl; import com.intellij.codeInsight.CodeInsightSettings; +import com.intellij.codeInsight.completion.CompletionProcess; +import com.intellij.codeInsight.completion.CompletionService; import com.intellij.codeInsight.completion.impl.CamelHumpMatcher; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; @@ -119,7 +121,10 @@ public class LookupManagerImpl extends LookupManager { final Runnable request = new Runnable() { public void run() { if (myActiveLookup == lookup) { - DocumentationManager.getInstance(myProject).showJavaDocInfo(editor, psiFile, false); + final CompletionProcess completion = CompletionService.getCompletionService().getCurrentCompletion(); + if (completion == null || !completion.isAutopopupCompletion()) { + DocumentationManager.getInstance(myProject).showJavaDocInfo(editor, psiFile, false); + } } } };