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

Fix resolve scope for annotations in UnstableApiUsageInspection

Browse Source
This commit is contained in:
Yaroslav Pankratyev
2018-08-29 10:29:08 +07:00
parent 53b2e3eee5
commit 63dbd7ad13
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jvm/jvm-analysis-impl/src/com/intellij/codeInspection/UnstableApiUsageInspection.java
+6 -8
View File
@@ -5,8 +5,7 @@ import com.intellij.analysis.JvmAnalysisBundle;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.util.SpecialAnnotationsUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -55,8 +54,7 @@ public class UnstableApiUsageInspection extends LocalInspectionTool {
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
Module module = ModuleUtilCore.findModuleForFile(holder.getFile());
if (!isApplicable(module)) {
if (!isApplicable(holder.getFile(), holder.getProject())) {
return PsiElementVisitor.EMPTY_VISITOR;
}
@@ -147,13 +145,13 @@ public class UnstableApiUsageInspection extends LocalInspectionTool {
return null;
}
private boolean isApplicable(@Nullable Module module) {
if (module == null) {
private boolean isApplicable(@Nullable PsiFile file, @Nullable Project project) {
if (file == null || project == null) {
return false;
}
JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(module.getProject());
GlobalSearchScope scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, false);
JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(project);
GlobalSearchScope scope = file.getResolveScope();
for (String annotation : unstableApiAnnotations) {
if (javaPsiFacade.findClass(annotation, scope) != null) {
return true;