MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-16 08:39:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't report groovy type parameters as unused

Browse Source
This commit is contained in:
peter
2012-01-31 22:53:36 +01:00
parent 605fd3c38c
commit 2007f9c8a3
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/GlobalUsageHelper.java
+1 -1
View File
@@ -31,5 +31,5 @@ public abstract class GlobalUsageHelper {
public abstract boolean shouldCheckUsages(@NotNull PsiMember member);
public abstract boolean isLocallyUsed(@NotNull PsiNamedElement member);
public abstract boolean shouldIgnoreUsagesInCurrentFile();
public abstract boolean isCurrentFileAlreadyChecked();
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
+8 -6
View File
@@ -261,7 +261,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
}
@Override
public boolean shouldIgnoreUsagesInCurrentFile() {
public boolean isCurrentFileAlreadyChecked() {
return true;
}
@@ -585,7 +585,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
if (isImplicitUsage(method, progress)) {
return true;
}
if (!helper.shouldIgnoreUsagesInCurrentFile()) {
if (!helper.isCurrentFileAlreadyChecked()) {
return !weAreSureThereAreNoUsages(method, progress, helper);
}
}
@@ -622,7 +622,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
}
PsiSearchHelper.SearchCostResult cheapEnough = PsiSearchHelper.SERVICE.getInstance(project).isCheapEnoughToSearch(name, (GlobalSearchScope)useScope,
helper.shouldIgnoreUsagesInCurrentFile() ? member.getContainingFile() : null,
helper.isCurrentFileAlreadyChecked() ? member.getContainingFile() : null,
progress);
if (cheapEnough == PsiSearchHelper.SearchCostResult.TOO_MANY_OCCURRENCES) return false;
@@ -702,9 +702,11 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
private static boolean isReallyUsed(PsiClass aClass, ProgressIndicator progress, GlobalUsageHelper helper) {
if (isImplicitUsage(aClass, progress) || helper.isLocallyUsed(aClass)) return true;
if (aClass.getContainingClass() != null && aClass.hasModifierProperty(PsiModifier.PRIVATE) ||
aClass.getParent() instanceof PsiDeclarationStatement ||
aClass instanceof PsiTypeParameter) return false;
if (helper.isCurrentFileAlreadyChecked()) {
if (aClass.getContainingClass() != null && aClass.hasModifierProperty(PsiModifier.PRIVATE) ||
aClass.getParent() instanceof PsiDeclarationStatement ||
aClass instanceof PsiTypeParameter) return false;
}
return !weAreSureThereAreNoUsages(aClass, progress, helper);
}