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

EA-32959 - NPE: GlobalInspectionContextImpl.isToCheckMember

Browse Source
This commit is contained in:
Anna Kozlova
2012-01-25 19:49:08 +04:00
parent fff27f0c5b
commit a5f1850a68
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+12 -8
View File
@@ -164,10 +164,12 @@ public class GlobalInspectionContextImpl extends UserDataHolderBase implements G
if (file == null) return false;
final Project project = file.getProject();
final Tools tools = myTools.get(tool.getShortName());
for (ScopeToolState state : tools.getTools()) {
final NamedScope namedScope = state.getScope(project);
if (namedScope == null || namedScope.getValue().contains(file, getCurrentProfile().getProfileManager().getScopesManager())) {
return state.isEnabled() && ((GlobalInspectionToolWrapper)state.getTool()).getTool() == tool;
if (tools != null) {
for (ScopeToolState state : tools.getTools()) {
final NamedScope namedScope = state.getScope(project);
if (namedScope == null || namedScope.getValue().contains(file, getCurrentProfile().getProfileManager().getScopesManager())) {
return state.isEnabled() && ((GlobalInspectionToolWrapper)state.getTool()).getTool() == tool;
}
}
}
return false;
@@ -351,10 +353,12 @@ public class GlobalInspectionContextImpl extends UserDataHolderBase implements G
public boolean isToCheckMember(final PsiElement element, final InspectionProfileEntry tool) {
final Tools tools = myTools.get(tool.getShortName());
for (ScopeToolState state : tools.getTools()) {
final NamedScope namedScope = state.getScope(element.getProject());
if (namedScope == null || namedScope.getValue().contains(element.getContainingFile(), getCurrentProfile().getProfileManager().getScopesManager())) {
return state.isEnabled() && state.getTool() == tool;
if (tools != null) {
for (ScopeToolState state : tools.getTools()) {
final NamedScope namedScope = state.getScope(element.getProject());
if (namedScope == null || namedScope.getValue().contains(element.getContainingFile(), getCurrentProfile().getProfileManager().getScopesManager())) {
return state.isEnabled() && state.getTool() == tool;
}
}
}
return false;