MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 06:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-49302 - NPE: UnusedDeclarationInspection.checkForReachables

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-10-25 13:42:20 +04:00
parent e59b7dab25
commit e85708a1a9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
+5 -5
View File
@@ -391,7 +391,7 @@ public class UnusedDeclarationInspection extends GlobalInspectionTool {
});
if (isAddNonJavaUsedEnabled()) {
checkForReachables();
checkForReachables(globalContext);
final StrictUnreferencedFilter strictUnreferencedFilter = new StrictUnreferencedFilter(this, globalContext);
ProgressManager.getInstance().runProcess(new Runnable() {
@Override
@@ -520,7 +520,7 @@ public class UnusedDeclarationInspection extends GlobalInspectionTool {
public boolean queryExternalUsagesRequests(@NotNull InspectionManager manager,
@NotNull GlobalInspectionContext globalContext,
@NotNull ProblemDescriptionsProcessor problemDescriptionsProcessor) {
checkForReachables();
checkForReachables(globalContext);
final RefFilter filter = myPhase == 1 ? new StrictUnreferencedFilter(this, globalContext) :
new RefUnreachableFilter(this, globalContext);
final boolean[] requestAdded = {false};
@@ -647,16 +647,16 @@ public class UnusedDeclarationInspection extends GlobalInspectionTool {
}
void checkForReachables() {
void checkForReachables(@NotNull final GlobalInspectionContext context) {
CodeScanner codeScanner = new CodeScanner();
// Cleanup previous reachability information.
getContext().getRefManager().iterate(new RefJavaVisitor() {
context.getRefManager().iterate(new RefJavaVisitor() {
@Override
public void visitElement(@NotNull RefEntity refEntity) {
if (refEntity instanceof RefJavaElement) {
final RefJavaElementImpl refElement = (RefJavaElementImpl)refEntity;
if (!((GlobalInspectionContextBase)getContext()).isToCheckMember(refElement, UnusedDeclarationInspection.this)) return;
if (!((GlobalInspectionContextBase)context).isToCheckMember(refElement, UnusedDeclarationInspection.this)) return;
refElement.setReachable(false);
}
}
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java
+1 -1
View File
@@ -334,7 +334,7 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
@Override
public void updateContent() {
getTool().checkForReachables();
getTool().checkForReachables(getContext());
myPackageContents = new HashMap<String, Set<RefEntity>>();
getContext().getRefManager().iterate(new RefJavaVisitor() {
@Override public void visitElement(@NotNull RefEntity refEntity) {