Merge branch 'master' into changeSignature

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) {}
      

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)}
      */

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() {}
 

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() {}
      

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
    */

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) {}

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() {}