From 8d3b62d33df96d9479cabd6e0b36fa3f6b463f91 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 21 Feb 2017 15:47:56 +0300 Subject: [PATCH] more diagnostics for EA-95877 --- .../visibility/AccessCanBeTightenedInspection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java index 3c86ff130ba8..0a95303917fc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspection.java @@ -130,10 +130,10 @@ class AccessCanBeTightenedInspection extends BaseJavaBatchLocalInspectionTool { return; } } - PsiElement toHighlight = currentLevel == PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL ? ((PsiNameIdentifierOwner)member).getNameIdentifier() : ContainerUtil.find( - memberModifierList.getChildren(), + PsiElement toHighlight = currentLevel == PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL ? ((PsiNameIdentifierOwner)member).getNameIdentifier() : + ContainerUtil.find(memberModifierList.getChildren(), element -> element instanceof PsiKeyword && element.getText().equals(PsiUtil.getAccessModifier(currentLevel))); - assert toHighlight != null : member +" ; " + ((PsiNameIdentifierOwner)member).getNameIdentifier() + "; "+ memberModifierList.getText(); + assert toHighlight != null : "Member:"+member.getText() +"; Identifier:" + ((PsiNameIdentifierOwner)member).getNameIdentifier() + "; modifierList:"+ memberModifierList.getText()+"; currentLevel:"+currentLevel+";"; String suggestedModifier = PsiUtil.getAccessModifier(suggestedLevel); myHolder.registerProblem(toHighlight, "Access can be " + VisibilityUtil.toPresentableText(suggestedModifier), new ChangeModifierFix(suggestedModifier)); }