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

IDEA-140025 retain all spaces after @literal tag name

Browse Source
This commit is contained in:
Dmitry Batrak
2015-05-21 12:00:52 +03:00
parent b91578f331
commit 17373cf955
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+4 -7
View File
@@ -34,7 +34,6 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.JavaConstantExpressionEvaluator;
import com.intellij.psi.impl.source.javadoc.PsiInlineDocTagImpl;
import com.intellij.psi.impl.source.tree.JavaDocElementType;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.javadoc.PsiDocTag;
@@ -1317,9 +1316,7 @@ public class JavaDocInfoGenerator {
generateLinkValue(tag, buffer, false);
}
else if (tagName.equals(LITERAL_TAG)) {
final PsiElement[] dataElements = tag instanceof PsiInlineDocTagImpl ?((PsiInlineDocTagImpl)tag).getDataElementsIgnoreWhitespaces()
: tag.getDataElements();
generateLiteralValue(buffer, dataElements);
generateLiteralValue(buffer, tag);
}
else if (tagName.equals(CODE_TAG)) {
generateCodeValue(tag, buffer);
@@ -1350,12 +1347,12 @@ public class JavaDocInfoGenerator {
@SuppressWarnings({"HardCodedStringLiteral"})
private static void generateCodeValue(PsiInlineDocTag tag, StringBuilder buffer) {
buffer.append("<code>");
generateLiteralValue(buffer, tag.getDataElements());
generateLiteralValue(buffer, tag);
buffer.append("</code>");
}
private static void generateLiteralValue(StringBuilder buffer, final PsiElement[] dataElements) {
for (PsiElement element : dataElements) {
private static void generateLiteralValue(StringBuilder buffer, PsiDocTag tag) {
for (PsiElement element : tag.getDataElements()) {
appendPlainText(element.getText(), buffer);
}
}
java/java-tests/testData/codeInsight/javadocIG/multipleSpacesInLiteral.html
+2
View File
@@ -0,0 +1,2 @@
<html><head><base href="placeholder"> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body><PRE>class <b>Test</b>
extends <a href="psi_element://java.lang.Object"><code>Object</code></a></PRE> <pre>a bc</pre></body></html>
java/java-tests/testData/codeInsight/javadocIG/multipleSpacesInLiteral.java
+2
View File
@@ -0,0 +1,2 @@
/** <pre>a{@literal b}c</pre> */
class Test {}
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+4
View File
@@ -258,6 +258,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase {
public void testHtmlLinkWithRef() throws Exception {
verifyJavaDoc(getTestClass());
}
public void testMultipleSpacesInLiteral() throws Exception {
verifyJavaDoc(getTestClass());
}
@Override
protected String getTestDataPath() {