From 824f4329b276b4d61eb10265239e8b4a846977b5 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 21 Jul 2014 17:49:29 +0200 Subject: [PATCH] workaround for

inside 

 in javadoc preview in
 JEditorPane (IDEA-127430)

---
 .../codeInsight/javadoc/JavaDocInfoGenerator.java      |  1 +
 .../testData/codeInsight/javadocIG/pInsidePre.html     |  6 ++++++
 .../testData/codeInsight/javadocIG/pInsidePre.java     | 10 ++++++++++
 .../codeInsight/javadoc/JavaDocInfoGeneratorTest.java  |  4 ++++
 4 files changed, 21 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/javadocIG/pInsidePre.html
 create mode 100644 java/java-tests/testData/codeInsight/javadocIG/pInsidePre.java

diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index eefe8cf393ac..f80457c676b8 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -218,6 +218,7 @@ public class JavaDocInfoGenerator {
       LOG.debug(text);
     }
 
+    text = StringUtil.replaceIgnoreCase(text, "
", "
");
     return StringUtil.replace(text, "/>", ">");
   }
 
diff --git a/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.html b/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.html
new file mode 100644
index 000000000000..fbfd2983208a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.html
@@ -0,0 +1,6 @@
+    Test
public String field = null

+     
+         foo
+         

+         bar
+     

\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.java b/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.java
new file mode 100644
index 000000000000..0627e4b99510
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/javadocIG/pInsidePre.java
@@ -0,0 +1,10 @@
+class Test {
+  /**
+   * 
+   *     foo
+   *     

+   *     bar
+   * 

+   */
+  public String field = null;
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
index 454bb7f97a58..a4de0bcdcab8 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
@@ -88,6 +88,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase {
     doTestField();
   }
 
+  public void testPInsidePre() throws Exception {
+    doTestField();
+  }
+
   public void testEnumConstantOrdinal() throws Exception {
     PsiClass psiClass = getTestClass();
     PsiField field = psiClass.getFields() [0];