fix tests

This commit is contained in:
Bas Leijdekkers
2015-03-31 12:29:11 +02:00
parent d0ba874be0
commit c809bc2582
2 changed files with 3 additions and 10 deletions
@@ -364,14 +364,6 @@ public class JavaDocUtil {
}
public static boolean isInsidePackageInfo(@Nullable PsiDocComment containingComment) {
if (containingComment == null || containingComment.getOwner() != null) {
return false;
}
final PsiElement parent = containingComment.getParent();
if (!(parent instanceof PsiJavaFile)) {
return false;
}
final PsiJavaFile file = (PsiJavaFile)parent;
return "package-info.java".equals(file.getName());
return containingComment != null && containingComment.getOwner() == null && containingComment.getParent() instanceof PsiJavaFile;
}
}
@@ -133,7 +133,8 @@ public class DanglingJavadocInspection extends BaseInspection {
return;
}
if (JavaDocUtil.isInsidePackageInfo(comment) &&
PsiTreeUtil.skipSiblingsForward(comment, PsiWhiteSpace.class) instanceof PsiPackageStatement) {
PsiTreeUtil.skipSiblingsForward(comment, PsiWhiteSpace.class) instanceof PsiPackageStatement &&
"package-info.java".equals(comment.getContainingFile().getName())) {
return;
}
registerError(comment.getFirstChild());