azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract method

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-03-04 13:47:30 +04:00
parent d501e8821c
commit 4d51572482
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+1 -4
View File
@@ -66,10 +66,7 @@ public class Visibilities {
public static final Visibility INTERNAL = new Visibility("internal", false) {
@Override
protected boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(what, ModuleDescriptor.class, false);
ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(from, ModuleDescriptor.class, false);
assert parentModule != null && fromModule != null;
return parentModule.equals(fromModule);
return DescriptorUtils.isInSameModule(what, from);
}
};
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+7
View File
@@ -144,6 +144,13 @@ public class DescriptorUtils {
return fromPackage != null && whatPackage != null && whatPackage.equals(fromPackage);
}
public static boolean isInSameModule(@NotNull DeclarationDescriptor first, @NotNull DeclarationDescriptor second) {
ModuleDescriptor parentModule = DescriptorUtils.getParentOfType(first, ModuleDescriptor.class, false);
ModuleDescriptor fromModule = DescriptorUtils.getParentOfType(second, ModuleDescriptor.class, false);
assert parentModule != null && fromModule != null;
return parentModule.equals(fromModule);
}
@Nullable
public static DeclarationDescriptor findTopLevelParent(@NotNull DeclarationDescriptor declarationDescriptor) {
DeclarationDescriptor descriptor = declarationDescriptor;