fix JavadocInspectionQuickFixTest

java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java

@@ -518,7 +518,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
       }
       if (absentParameters != null) {
         for (PsiTypeParameter psiTypeParameter : absentParameters) {
-          problems.add(createMissingParamTagDescriptor(nameIdentifier, psiTypeParameter, manager, isOnTheFly));
+          problems.add(createMissingParamTagDescriptor(docComment.getFirstChild(), psiTypeParameter, manager, isOnTheFly));
         }
       }
     }
@@ -578,11 +578,11 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
     return problems;
   }
 
-  private static ProblemDescriptor createMissingParamTagDescriptor(final PsiIdentifier nameIdentifier,
+  private static ProblemDescriptor createMissingParamTagDescriptor(final PsiElement elementToHighlight,
                                                                    final PsiTypeParameter psiTypeParameter,
                                                                    final InspectionManager manager, boolean isOnTheFly) {
     String message = InspectionsBundle.message("inspection.javadoc.problem.missing.tag", "<code>@param</code>");
-    return createDescriptor(nameIdentifier, message, new AddMissingTagFix("param", "<" + psiTypeParameter.getName() + ">"), manager,
+    return createDescriptor(elementToHighlight, message, new AddMissingTagFix("param", "<" + psiTypeParameter.getName() + ">"), manager,
                             isOnTheFly);
   }
 
@@ -885,8 +885,11 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
     protected PsiElement getAnchor(ProblemDescriptor descriptor) {
       PsiElement element = descriptor.getPsiElement();
       PsiElement parent = element == null ? null : element.getParent();
-      if (!(parent instanceof PsiMethod)) return null;
-      PsiParameter[] parameters = ((PsiMethod)parent).getParameterList().getParameters();
+      if (!(parent instanceof PsiDocComment)) return null;
+      final PsiDocComment docComment = (PsiDocComment)parent;
+      final PsiDocCommentOwner owner = docComment.getOwner();
+      if (!(owner instanceof PsiMethod)) return null;
+      PsiParameter[] parameters = ((PsiMethod)owner).getParameterList().getParameters();
       PsiParameter myParam = ContainerUtil.find(parameters, new Condition<PsiParameter>() {
         @Override
         public boolean value(PsiParameter psiParameter) {
@@ -895,10 +898,6 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
       });
       if (myParam == null) return null;
 
-      final PsiMethod psiMethod = PsiTreeUtil.getParentOfType(myParam, PsiMethod.class);
-      LOG.assertTrue(psiMethod != null);
-      final PsiDocComment docComment = psiMethod.getDocComment();
-      LOG.assertTrue(docComment != null);
       PsiDocTag[] tags = docComment.findTagsByName("param");
       if (tags.length == 0) { //insert as first tag or append to description
         tags = docComment.getTags();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/after1.java

@@ -3,7 +3,7 @@ class a {
 /**
  * @throws Exception
  */
-public void <caret>run() throws Exception {
+public void run() throws Exception {
 
 }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/after3.java

@@ -5,7 +5,7 @@ class a {
  * @param a
  * @param b
 */
-public void <caret>foo(int a, int b, in c){
+public void foo(int a, int b, in c){
 
 }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/after4.java

@@ -2,5 +2,5 @@
 /**
  * @param <T>
  */
-class <caret>a<T> {
+class a<T> {
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/before1.java

@@ -1,8 +1,8 @@
 // "Add tag @throws java.lang.Exception" "true"
 class a {
-/**
+/**<caret>
 */
-public void <caret>run() throws Exception {
+public void run() throws Exception {
 
 }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/before3.java

@@ -1,10 +1,10 @@
 // "Add tag @param for parameter 'a'" "true"
 class a {
 
-/**
+/**<caret>
  * @param b
 */
-public void <caret>foo(int a, int b, in c){
+public void foo(int a, int b, in c){
 
 }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags/before4.java

@@ -1,5 +1,5 @@
 // "Add tag @param <T>" "true"
-/**
+/**<caret>
  */
-class <caret>a<T> {
+class a<T> {
 }