From 8b9c2074f06b9235f8d3be1d18da3399a2e3a513 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Tue, 4 May 2010 13:16:52 +0400
Subject: [PATCH] javadoc reference errors: do not highlight too much - leave
 valid parts of the reference untouched ( IDEA-36904  )

---
 .../javaDoc/JavaDocReferenceInspection.java              | 9 +++++----
 .../codeInsight/daemonCodeAnalyzer/javaDoc/Link0.java    | 2 +-
 .../javaDoc/LinkFromInnerClassToSelfMethod.java          | 2 +-
 .../codeInsight/daemonCodeAnalyzer/javaDoc/See0.java     | 2 +-
 .../codeInsight/daemonCodeAnalyzer/javaDoc/See3.java     | 2 +-
 .../daemonCodeAnalyzer/javaDoc/SeeConstants.java         | 2 +-
 .../daemonCodeAnalyzer/javaDoc/ValueBadReference.java    | 2 +-
 .../codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java   | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
index 9bf82b401d38..0742567b3e23 100644
--- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
@@ -75,7 +75,8 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
     docComment.accept(getVisitor(references, docCommentOwner, problems, manager, isOnTheFly));
     for (PsiJavaCodeReferenceElement reference : references) {
       final List<PsiClass> classesToImport = new ImportClassFix(reference).getClassesToImport();
-      problems.add(manager.createProblemDescriptor(reference, cannotResolveSymbolMessage("<code>" + reference.getText() + "</code>"),
+      final PsiElement referenceNameElement = reference.getReferenceNameElement();
+      problems.add(manager.createProblemDescriptor(referenceNameElement != null ? referenceNameElement : reference, cannotResolveSymbolMessage("<code>" + reference.getText() + "</code>"),
                                                    !isOnTheFly || classesToImport.isEmpty() ? null : new AddImportFix(classesToImport), ProblemHighlightType.LIKE_UNKNOWN_SYMBOL,
                                                    isOnTheFly));
     }
@@ -180,9 +181,9 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
             }
             fixes.add(new RemoveTagFix(tagName, paramName, tag));
 
-            problems.add(inspectionManager.createProblemDescriptor(valueElement, cannotResolveSymbolMessage(params), onTheFly,
-                                                                   fixes.toArray(new LocalQuickFix[fixes.size()]),
-                                                                   ProblemHighlightType.LIKE_UNKNOWN_SYMBOL));
+            problems.add(inspectionManager.createProblemDescriptor(valueElement, reference.getRangeInElement(), cannotResolveSymbolMessage(params),
+                                                                   ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly,
+                                                                   fixes.toArray(new LocalQuickFix[fixes.size()])));
           }
         }
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Link0.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Link0.java
index b317f020e162..733cec2da1a9 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Link0.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Link0.java
@@ -1,6 +1,6 @@
 class Test {
     /**
-     *  @param ppp see {@link <error>#Test</error>}
+     *  @param ppp see {@link #<error>Test</error>}
      */
      public void i(int ppp) {}
      
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkFromInnerClassToSelfMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkFromInnerClassToSelfMethod.java
index 728c62bd2142..c8a24ca4ee9d 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkFromInnerClassToSelfMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/LinkFromInnerClassToSelfMethod.java
@@ -2,7 +2,7 @@ class Test {
 
      public void i(int ppp) {}
      /**
-      * {@link <error>#foo(int)</error>}
+      * {@link #<error>foo(int)</error>}
       * {@link #foo()}
       * {@link #i(int)}
      */
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See0.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See0.java
index 8fba319447b9..3b16ac9fd196 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See0.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See0.java
@@ -1,6 +1,6 @@
 class Test {
     /**
-     *  @see <error>A#someField</error>
+     *  @see A#<error>someField</error>
      */
      public void i() {}
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See3.java
index 84a76108a039..f5e465172ba3 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/See3.java
@@ -1,6 +1,6 @@
 class Test {
     /**
-     *  @see <error>#perform(int)</error>
+     *  @see #<error>perform(int)</error>
      */
     public void i() {}
      
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/SeeConstants.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/SeeConstants.java
index 04658752ea22..1437f1c27e9e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/SeeConstants.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/SeeConstants.java
@@ -3,7 +3,7 @@ public class SeeConstants {
   public static final String UUU="";
 
   /**
-   * @see <error>SeeConstants.III</error>
+   * @see SeeConstants.<error>III</error>
    * @see SeeConstants#UUU
    * @param args blah-blah
    */
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/ValueBadReference.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/ValueBadReference.java
index 955ac0c9f975..1a5b18185041 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/ValueBadReference.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/ValueBadReference.java
@@ -1,6 +1,6 @@
 class Test {
     /**
-     * Value is {@value <error>#badReference</error>}
+     * Value is {@value #<error>badReference</error>}
      * @param ppp .
      */
      public void i(int ppp) {}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java
index cfe0f303f84e..604c85627cc2 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Vararg.java
@@ -1,7 +1,7 @@
 public class Test {
    /**
      * @see Test#test(String, int...)
-     * @see <error>Test#test(String, long...)</error>
+     * @see Test#<error>test(String, long...)</error>
    **/
     void foo() {}