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-158863 Semantic highlighting for Java-doc

Browse Source
This commit is contained in:
Alexey Utkin
2016-07-21 19:50:07 +03:00
parent 906180bbe1
commit 7b236d522b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/JavaRainbowVisitor.java
+10 -3
View File
@@ -21,6 +21,8 @@ import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
import com.intellij.ide.highlighter.JavaHighlightingColors;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.javadoc.PsiDocParamRef;
import com.intellij.psi.javadoc.PsiDocTagValue;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -37,14 +39,17 @@ public class JavaRainbowVisitor extends RainbowVisitor {
if (element instanceof PsiReferenceExpression
|| element instanceof PsiLocalVariable
|| element instanceof PsiParameter) {
|| element instanceof PsiParameter
|| element instanceof PsiDocParamRef) {
PsiElement context = PsiTreeUtil.findFirstParent(element, p -> p instanceof PsiMethod);
if (context != null) {
HighlightInfo attrs = getRainbowSymbolKey(
context,
element instanceof PsiReferenceExpression
? Pair.create(element, ((PsiReferenceExpression)element).resolve())
: Pair.create(((PsiVariable)element).getNameIdentifier(), element));
: element instanceof PsiDocParamRef
? Pair.create(element, element.getReference() == null ? null : element.getReference().resolve())
: Pair.create(((PsiVariable)element).getNameIdentifier(), element));
if (attrs != null) {
addInfo(attrs);
}
@@ -62,7 +67,9 @@ public class JavaRainbowVisitor extends RainbowVisitor {
if (name != null) {
return getInfo(context, rainbow.first, name, rainbow.second instanceof PsiLocalVariable
? JavaHighlightingColors.LOCAL_VARIABLE_ATTRIBUTES
: JavaHighlightingColors.PARAMETER_ATTRIBUTES);
: rainbow.first instanceof PsiDocTagValue
? JavaHighlightingColors.DOC_COMMENT_TAG_VALUE
: JavaHighlightingColors.PARAMETER_ATTRIBUTES);
}
}
return null;
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightRainbowHighlightingTest.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class LightRainbowHighlightingTest extends LightCodeInsightFixtureTestCas
"}", true, false);
}
public void fixme_testRainbowParamsInJavadocHaveTheSameColorsAsInCode() throws Exception {
public void testRainbowParamsInJavadocHaveTheSameColorsAsInCode() throws Exception {
checkRainbow(
"class TestClass {\n" +
" /**\n" +