From a395c8d0f3f5793842001bae6de06add083e25d6 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 29 May 2018 18:19:36 +0300 Subject: [PATCH] make highlighting do useful work in non-physical file --- .../daemon/impl/analysis/HighlightUtil.java | 12 ++++++------ .../daemon/impl/analysis/HighlightVisitorImpl.java | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 0c661c29c455..33a74339c0fc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -883,16 +883,16 @@ public class HighlightUtil extends HighlightUtilBase { isAllowed = false; } - if (PsiModifier.PRIVATE.equals(modifier)) { - isAllowed &= modifierOwnerParent instanceof PsiClass && - (!((PsiClass)modifierOwnerParent).isInterface() || PsiUtil.isLanguageLevel9OrHigher(modifierOwner) && !((PsiClass)modifierOwnerParent).isAnnotationType()); + if (PsiModifier.PRIVATE.equals(modifier) && modifierOwnerParent instanceof PsiClass) { + isAllowed &= !((PsiClass)modifierOwnerParent).isInterface() || + PsiUtil.isLanguageLevel9OrHigher(modifierOwner) && !((PsiClass)modifierOwnerParent).isAnnotationType(); } else if (PsiModifier.STRICTFP.equals(modifier)) { - isAllowed &= modifierOwnerParent instanceof PsiClass && (!((PsiClass)modifierOwnerParent).isInterface() || PsiUtil.isLanguageLevel8OrHigher(modifierOwner)); + isAllowed &= !((PsiClass)modifierOwnerParent).isInterface() || PsiUtil.isLanguageLevel8OrHigher(modifierOwner); } else if (PsiModifier.PROTECTED.equals(modifier) || PsiModifier.TRANSIENT.equals(modifier) || PsiModifier.SYNCHRONIZED.equals(modifier)) { - isAllowed &= modifierOwnerParent instanceof PsiClass && !((PsiClass)modifierOwnerParent).isInterface(); + isAllowed &= !((PsiClass)modifierOwnerParent).isInterface(); } if (containingClass != null && containingClass.isInterface()) { @@ -1238,7 +1238,7 @@ public class HighlightUtil extends HighlightUtilBase { @NotNull private static List checkMultiCatchParameter(@NotNull final PsiParameter parameter, - @NotNull final Collection thrownTypes) { + @NotNull final Collection thrownTypes) { final List typeElements = PsiUtil.getParameterTypeElements(parameter); final List highlights = new ArrayList<>(typeElements.size()); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 65467a5e6f6f..48e07aef03f9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -912,8 +912,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh public void visitMethodCallExpression(PsiMethodCallExpression expression) { if (!myHolder.hasErrorResults()) myHolder.add(GenericsHighlightUtil.checkEnumSuperConstructorCall(expression)); if (!myHolder.hasErrorResults()) myHolder.add(HighlightClassUtil.checkSuperQualifierType(myFile.getProject(), expression)); - // in case of JSP synthetic method call, do not check - if (myFile.isPhysical() && !myHolder.hasErrorResults()) { + if (!myHolder.hasErrorResults()) { try { myHolder.add(HighlightMethodUtil.checkMethodCall(expression, myResolveHelper, myLanguageLevel, myJavaSdkVersion, myFile)); }