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

unused inspection: do not highlight class as unused if some of containing members are entry points (IDEA-206052)

Browse Source
This commit is contained in:
Dmitry Batkovich
2019-02-05 14:57:26 +03:00
parent e5b214d2e8
commit 37dec0653a
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/RefCountHolder.java
+50 -23
View File
@@ -34,8 +34,7 @@ import com.intellij.psi.util.PsiMatcherImpl;
import com.intellij.psi.util.PsiMatchers;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtilRt;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.containers.Predicate;
import com.intellij.util.containers.*;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -43,10 +42,7 @@ import org.jetbrains.annotations.Nullable;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
class RefCountHolder {
@@ -119,25 +115,39 @@ class RefCountHolder {
VirtualFile virtualFile = viewProvider.getVirtualFile();
boolean inLibrary = fileIndex.isInLibrary(virtualFile);
boolean myDeadCodeEnabled = deadCodeInspection != null && isUnusedToolEnabled && deadCodeInspection.isGlobalEnabledInEditor();
Predicate<PsiElement> myIsEntryPointPredicate = (@NotNull PsiElement member) -> !myDeadCodeEnabled || deadCodeInspection.isEntryPoint(member);
boolean isDeadCodeEnabled = deadCodeInspection != null && isUnusedToolEnabled && deadCodeInspection.isGlobalEnabledInEditor();
if (isDeadCodeEnabled && !inLibrary) {
return new GlobalUsageHelperBase() {
Map<PsiMember, Boolean> myEntryPointCache;
{
myEntryPointCache = FactoryMap.create((PsiMember member) -> {
if (isEntryPoint(member)) return true;
if (member instanceof PsiClass) {
return !JBTreeTraverser
.<PsiMember>from(m -> m instanceof PsiClass
? JBIterable.from(PsiTreeUtil.getStubChildrenOfTypeAsList(m, PsiMember.class))
: JBIterable.empty())
.withRoot(member)
.traverse()
.skip(1)
.processEach(m -> !myEntryPointCache.get(m));
}
return false;
});
}
return new GlobalUsageHelper() {
@Override
public boolean shouldCheckUsages(@NotNull PsiMember member) {
return !inLibrary && !myIsEntryPointPredicate.apply(member);
}
@Override
public boolean shouldCheckUsages(@NotNull PsiMember member) {
return !myEntryPointCache.get(member);
}
@Override
public boolean isCurrentFileAlreadyChecked() {
return true;
}
@Override
public boolean isLocallyUsed(@NotNull PsiNamedElement member) {
return isReferenced(member);
}
};
private boolean isEntryPoint(@NotNull PsiElement element) {
return deadCodeInspection.isEntryPoint(element);
}
};
} else {
return new GlobalUsageHelperBase();
}
}
private void clear() {
@@ -371,4 +381,21 @@ class RefCountHolder {
private static void log(@NonNls @NotNull Object... info) {
FileStatusMap.log(info);
}
private class GlobalUsageHelperBase extends GlobalUsageHelper {
@Override
public boolean shouldCheckUsages(@NotNull PsiMember member) {
return false;
}
@Override
public boolean isCurrentFileAlreadyChecked() {
return true;
}
@Override
public boolean isLocallyUsed(@NotNull PsiNamedElement member) {
return isReferenced(member);
}
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+1 -2
View File
@@ -125,8 +125,7 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
point.registerExtension(extension);
infos = doHighlighting(HighlightSeverity.WARNING);
HighlightInfo info = assertOneElement(infos);
assertEquals("Class 'WithMain' is never used", info.getDescription());
assertEmpty(infos);
}
finally {
point.unregisterExtension(extension);