MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

external javadoc: don't append garbage to the view (IDEA-177046)

Browse Source
This commit is contained in:
Anna Kozlova
2018-01-03 21:10:47 +01:00
parent 26649ec323
commit b72aae1b8a
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/externalJavadoc/String/7/expected.html
+1 -4
View File
@@ -25,13 +25,10 @@
</ul>
</li>
</ul>
<DL> <ul class="blockList">
<li class="blockList">
<dl>
<DL> <dl>
<dt>All Implemented Interfaces:</dt>
<dd><a href="../../java/io/Serializable.html" title="interface in java.io">Serializable</a>, <a href="../../java/lang/CharSequence.html" title="interface in java.lang">CharSequence</a>, <a href="../../java/lang/Comparable.html" title="interface in java.lang">Comparable</a>&lt;<a href="../../java/lang/String.html" title="class in java.lang">String</a>&gt;</dd>
</dl>
<hr>
<br>
<pre>public final class <span class="strong">String</span>
extends <a href="../../java/lang/Object.html" title="class in java.lang">Object</a>
java/java-tests/testData/codeInsight/externalJavadoc/noMethodsOrFieldsInClass/expected.html
-2
View File
@@ -24,6 +24,4 @@
</ul>
</div>
</div>
<ul class="blockList">
<li class="blockList">
</HTML>
platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
+14 -6
View File
@@ -256,12 +256,16 @@ public abstract class AbstractExternalFilter {
StringBuilder classDetails = new StringBuilder();
while (((read = buf.readLine()) != null) && !StringUtil.toUpperCase(read).equals(HR) && !StringUtil.toUpperCase(read).equals(P)) {
if (reachTheEnd(data, read, classDetails, endSection)) return;
appendLine(classDetails, read);
if (!skipBlockList(read)) {
appendLine(classDetails, read);
}
}
while (((read = buf.readLine()) != null) && !StringUtil.toUpperCase(read).equals(P) && !StringUtil.toUpperCase(read).equals(HR)) {
while (((read = buf.readLine()) != null) && !StringUtil.toUpperCase(read).equals(HR) && !StringUtil.toUpperCase(read).equals(P)) {
if (reachTheEnd(data, read, classDetails, endSection)) return;
appendLine(data, read.replaceAll(DT, DT + BR));
if (!skipBlockList(read)) {
appendLine(data, read.replaceAll(DT, DT + BR));
}
}
data.append(classDetails);
@@ -274,9 +278,7 @@ public abstract class AbstractExternalFilter {
while (((read = buf.readLine()) != null) &&
!endSection.matcher(read).find() &&
StringUtil.indexOfIgnoreCase(read, GREATEST_END_SECTION, 0) == -1) {
if (!StringUtil.toUpperCase(read).contains(HR)
&& !StringUtil.containsIgnoreCase(read, "<ul class=\"blockList\">")
&& !StringUtil.containsIgnoreCase(read, "<li class=\"blockList\">")) {
if (!skipBlockList(read)) {
appendLine(data, read);
}
}
@@ -284,6 +286,12 @@ public abstract class AbstractExternalFilter {
data.append(HTML_CLOSE);
}
private static boolean skipBlockList(String read) {
return StringUtil.toUpperCase(read).contains(HR) ||
StringUtil.containsIgnoreCase(read, "<ul class=\"blockList\">") ||
StringUtil.containsIgnoreCase(read, "<li class=\"blockList\">");
}
@NotNull
protected ParseSettings getParseSettings(@NotNull String url) {
Pattern startSection = ourClassDataStartPattern;