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

escape xml in types and description templates (IDEA-133830)

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-04 13:43:00 +01:00
parent addaa53499
commit ad726d0abc
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/ex/HTMLJavaHTMLComposerImpl.java
+5 -5
View File
@@ -174,7 +174,7 @@ public class HTMLJavaHTMLComposerImpl extends HTMLJavaHTMLComposer {
buf.append(InspectionsBundle.message("inspection.export.results.field"));
buf.append(HTMLComposerImpl.NBSP).append(HTMLComposerImpl.CODE_OPENING);
buf.append(psiField.getType().getPresentableText());
buf.append(XmlStringUtil.escapeString(psiField.getType().getPresentableText()));
buf.append(HTMLComposerImpl.NBSP).append(HTMLComposerImpl.B_OPENING);
buf.append(psiField.getName());
buf.append(HTMLComposerImpl.B_CLOSING).append(HTMLComposerImpl.CODE_CLOSING);
@@ -201,7 +201,7 @@ public class HTMLJavaHTMLComposerImpl extends HTMLJavaHTMLComposer {
buf.append(HTMLComposerImpl.NBSP).append(HTMLComposerImpl.CODE_OPENING);
if (returnType != null) {
buf.append(returnType.getPresentableText());
buf.append(XmlStringUtil.escapeString(returnType.getPresentableText()));
buf.append(HTMLComposerImpl.NBSP);
}
@@ -281,7 +281,7 @@ public class HTMLJavaHTMLComposerImpl extends HTMLJavaHTMLComposer {
if (refElement instanceof RefField) {
RefField field = (RefField)refElement;
PsiField psiField = field.getElement();
buf.append(psiField.getType().getPresentableText());
buf.append(XmlStringUtil.escapeString(psiField.getType().getPresentableText()));
buf.append(HTMLComposerImpl.NBSP);
}
else if (refElement instanceof RefMethod) {
@@ -290,7 +290,7 @@ public class HTMLJavaHTMLComposerImpl extends HTMLJavaHTMLComposer {
PsiType returnType = psiMethod.getReturnType();
if (returnType != null) {
buf.append(returnType.getPresentableText());
buf.append(XmlStringUtil.escapeString(returnType.getPresentableText()));
buf.append(HTMLComposerImpl.NBSP);
}
}
@@ -349,7 +349,7 @@ public class HTMLJavaHTMLComposerImpl extends HTMLJavaHTMLComposer {
for (int i = 0; i < params.length; i++) {
if (i != 0) buf.append(", ");
PsiParameter param = params[i];
buf.append(param.getType().getPresentableText());
buf.append(XmlStringUtil.escapeString(param.getType().getPresentableText()));
if (showNames) {
buf.append(' ');
buf.append(param.getName());
platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java
+7 -1
View File
@@ -177,7 +177,13 @@ public class DescriptorComposer extends HTMLComposerImpl {
anchor.append("</font>");
}
String descriptionTemplate = XmlStringUtil.stripHtml(description.getDescriptionTemplate());
String descriptionTemplate = description.getDescriptionTemplate();
if (XmlStringUtil.isWrappedInHtml(descriptionTemplate)) {
descriptionTemplate = XmlStringUtil.stripHtml(descriptionTemplate);
}
else {
descriptionTemplate = XmlStringUtil.escapeString(descriptionTemplate);
}
//noinspection HardCodedStringLiteral
final String reference = "#ref";
final boolean containsReference = descriptionTemplate.contains(reference);