Add and use JetClassOrObject#isTopLevel()

This commit is contained in:
Pavel V. Talanov
2014-03-31 14:09:17 +04:00
parent 0bc176892f
commit b5374584bb
5 changed files with 11 additions and 8 deletions
@@ -41,7 +41,7 @@ public class JetPsiHeuristicsUtil {
// It is a Kotlin class already, we need to properly check visibility?
JetClassOrObject classOrObject = lightClass.getOrigin();
if (isTopLevelDeclaration(classOrObject) && classOrObject.hasModifier(JetTokens.PRIVATE_KEYWORD)) {
if (classOrObject.isTopLevel() && classOrObject.hasModifier(JetTokens.PRIVATE_KEYWORD)) {
// The class is declared private in the targetPackage
// It is visible in this package and all of its subpackages
JetFile targetFile = classOrObject.getContainingJetFile();
@@ -53,8 +53,4 @@ public class JetPsiHeuristicsUtil {
}
return member.hasModifierProperty(PsiModifier.PUBLIC) || member.hasModifierProperty(PsiModifier.PROTECTED);
}
public static boolean isTopLevelDeclaration(@NotNull JetClassOrObject classOrObject) {
return classOrObject.getContainingFile() == classOrObject.getParent();
}
}