From 42706b4ce60be4150108ad04e08096c2d1c82460 Mon Sep 17 00:00:00 2001
From: "peter.gromov" <peter@jetbrains.com>
Date: Thu, 25 Nov 2010 13:24:58 +0300
Subject: [PATCH] focus autopopup in javadoc

---
 .../completion/FocusInJavadoc.java            | 35 +++++++++++++++++++
 .../completion/JavaAutoPopupTest.groovy       | 12 +++++++
 resources/src/META-INF/IdeaPlugin.xml         |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 java/java-impl/src/com/intellij/codeInsight/completion/FocusInJavadoc.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FocusInJavadoc.java b/java/java-impl/src/com/intellij/codeInsight/completion/FocusInJavadoc.java
new file mode 100644
index 000000000000..95a99a37d912
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/FocusInJavadoc.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2010 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.completion;
+
+import com.intellij.psi.javadoc.PsiDocTag;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.ThreeState;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author peter
+ */
+public class FocusInJavadoc extends CompletionConfidence {
+  @NotNull
+  @Override
+  public ThreeState shouldFocusLookup(@NotNull CompletionParameters parameters) {
+    if (PsiTreeUtil.getParentOfType(parameters.getPosition(), PsiDocTag.class) != null) {
+      return ThreeState.YES;
+    }
+    return ThreeState.UNSURE;
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
index d00fcbdc4c4a..a3aaf232d1ae 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
@@ -217,4 +217,16 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
     assert lookup
   }
 
+  public void testFocusInJavadoc() {
+    myFixture.configureByText("a.java", """
+    /**
+    * {@link ArrLi<caret>}
+    */
+      class Foo {}
+    """)
+    type 's'
+    assert lookup.focused
+
+  }
+
 }
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index a0117012fb44..a11a1480624e 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -231,6 +231,7 @@
                            id="excludeFromCompletion" order="last"/>
 
     <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier" id="javaNameIdentifier"/>
+    <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.FocusInJavadoc" id="javadoc" order="before javaComments"/>
     <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedComments" id="javaComments"/>
     <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" id="javaTrue" order="last"/>