IDEA-98656 Java doc not generated when an other Java doc has been commented after.

java/java-tests/testData/codeInsight/generateJavadoc/afterBeforeCommentedJavadoc.java

@@ -0,0 +1,15 @@
+class Test {
+    /**
+     * <caret>
+     */
+    void test() {
+    }
+
+//    /**
+//     *
+//     * @param arg
+//     */
+//    public void secondMethod(int arg) {
+//    }
+
+}

java/java-tests/testData/codeInsight/generateJavadoc/afterDoubleSlashInJavadoc.java

@@ -0,0 +1,3 @@
+/** 
+ * <caret>Foo//bar */
+class Example{}

java/java-tests/testData/codeInsight/generateJavadoc/beforeBeforeCommentedJavadoc.java

@@ -0,0 +1,13 @@
+class Test {
+    /**<caret>
+    void test() {
+    }
+
+//    /**
+//     *
+//     * @param arg
+//     */
+//    public void secondMethod(int arg) {
+//    }
+
+}

java/java-tests/testData/codeInsight/generateJavadoc/beforeDoubleSlashInJavadoc.java

@@ -0,0 +1,2 @@
+/** <caret>Foo//bar */
+class Example{}

java/java-tests/testSrc/com/intellij/codeInsight/GenerateJavadocTest.java

@@ -16,6 +16,8 @@ public class GenerateJavadocTest extends CodeInsightTestCase {
   public void test3() throws Exception { doTest(); }
   public void testIdeadev2328() throws Exception { doTest(); }
   public void testIdeadev2328_2() throws Exception { doTest(); }
+  public void testBeforeCommentedJavadoc() throws Exception { doTest(); }
+  public void testDoubleSlashInJavadoc() throws Exception { doTest(); }
 
   private void doTest() throws Exception {
     String name = getTestName(false);

platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java

@@ -222,6 +222,9 @@ public class EnterHandler extends BaseEnterHandler {
       if (tokenType == commenter.getDocumentationCommentTokenType() || tokenType == commenter.getBlockCommentTokenType()) {
         return false;
       }
+      if (tokenType == commenter.getLineCommentTokenType() && lexer.getTokenText().contains(commentPrefix)) {
+        return false;
+      }
       if (lexer.getTokenEnd() == commentText.length()) {
         if (tokenType == commenter.getLineCommentTokenType()) {
           String prefix = commenter.getLineCommentPrefix();