add javadoc intention: fix for multiple field declaration IDEA-177456

java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java

@@ -409,7 +409,12 @@ public class JavaDocumentationProvider extends DocumentationProviderEx implement
       }
       return false;
     });
-    return docCommentOwner == null ? null : Pair.create(docCommentOwner, ((PsiDocCommentOwner)docCommentOwner).getDocComment());
+    if (docCommentOwner == null) return null;
+    PsiDocComment comment = ((PsiDocCommentOwner)docCommentOwner).getDocComment();
+    if (docCommentOwner instanceof PsiField) {
+      docCommentOwner = ((PsiField)docCommentOwner).getModifierList();
+    }
+    return Pair.create(docCommentOwner, comment);
   }
 
   @Override

java/java-tests/testData/codeInsight/addJavadoc/afterField2.java

@@ -0,0 +1,11 @@
+// "Add Javadoc" "true"
+
+class Test {
+
+    /**
+     * 
+     */
+  @XXX
+  int xxx = 1;
+
+}

java/java-tests/testData/codeInsight/addJavadoc/afterField3.java

@@ -0,0 +1,10 @@
+// "Add Javadoc" "true"
+
+class Test {
+
+    /**
+     * 
+     */
+  private @XXX int xxx = 1;
+
+}

java/java-tests/testData/codeInsight/addJavadoc/afterMultiFieldDeclaration.java

@@ -0,0 +1,7 @@
+// "Add Javadoc" "true"
+class Foo {
+    /**
+     * 
+     */
+  int x = 2, y = 1;
+}

java/java-tests/testData/codeInsight/addJavadoc/afterMultiFieldDeclaration2.java

@@ -0,0 +1,7 @@
+// "Add Javadoc" "true"
+class Foo {
+    /**
+     * 
+     */
+  int x = 2, y = 1;
+}

java/java-tests/testData/codeInsight/addJavadoc/beforeField2.java

@@ -0,0 +1,8 @@
+// "Add Javadoc" "true"
+
+class Test {
+
+  @XXX
+  int x<caret>xx = 1;
+
+}

java/java-tests/testData/codeInsight/addJavadoc/beforeField3.java

@@ -0,0 +1,7 @@
+// "Add Javadoc" "true"
+
+class Test {
+
+  private @XXX int x<caret>xx = 1;
+
+}

java/java-tests/testData/codeInsight/addJavadoc/beforeMultiFieldDeclaration.java

@@ -0,0 +1,4 @@
+// "Add Javadoc" "true"
+class Foo {
+  int x = 2, <caret>y = 1;
+}

java/java-tests/testData/codeInsight/addJavadoc/beforeMultiFieldDeclaration2.java

@@ -0,0 +1,4 @@
+// "Add Javadoc" "true"
+class Foo {
+  int <caret>x = 2, y = 1;
+}