diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.kt b/compiler/testData/diagnostics/tests/multimodule/internal.kt
index ff8362245e4..ef3feb5c04d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.kt
@@ -22,14 +22,14 @@ class B
import p.*
fun test() {
- val _a = a
- val _v = v
- a()
- B()
+ val _a = a
+ val _v = v
+ a()
+ B()
val inst = A()
- val ia = inst.a
- val iv = inst.v
- inst.a()
- inst.B()
+ val ia = inst.a
+ val iv = inst.v
+ inst.a()
+ inst.B()
}
\ No newline at end of file
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
index 71b5e855746..b2f75bb9313 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java
@@ -75,8 +75,8 @@ public class Visibilities {
public static final Visibility INTERNAL = new Visibility("internal", false) {
@Override
protected boolean isVisible(@NotNull DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) {
- DeclarationDescriptor fromOrModule = from instanceof PackageViewDescriptor ? ((PackageViewDescriptor) from).getModule() : from;
- return isInFriendModule(what, fromOrModule);
+ //NOTE: supposedly temporarily
+ return PUBLIC.isVisible(what, from);
}
};
@@ -119,6 +119,7 @@ public class Visibilities {
return findInvisibleMember(what, from) == null;
}
+ @SuppressWarnings("UnusedDeclaration")
private static boolean isInFriendModule(@NotNull DeclarationDescriptor what, @NotNull DeclarationDescriptor from) {
return DescriptorUtils.getContainingModule(what).isFriend(DescriptorUtils.getContainingModule(from));
}
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt b/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
index 874daf6137a..0cedfaffa26 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m2/m2.kt
@@ -11,9 +11,9 @@ public fun publicInM2() {
fun access() {
privateInM1()
- internalInM1()
+ internalInM1()
publicInM1()
-
+
privateInM1Test()
internalInM1Test()
publicInM1Test()
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt b/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
index 03f292b8af7..dac00159f24 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m2Test/m2Test.kt
@@ -11,11 +11,11 @@ public fun publicInM2Test() {
fun access() {
privateInM1()
- internalInM1()
+ internalInM1()
publicInM1()
privateInM1Test()
- internalInM1Test()
+ internalInM1Test()
publicInM1Test()
privateInM2()
diff --git a/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt b/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
index 50b6f1ef0a7..1ba13ed6322 100644
--- a/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
+++ b/idea/testData/multiModuleHighlighting/testRoot/m3Test/m3Test.kt
@@ -11,19 +11,19 @@ public fun publicInM3Test() {
fun access() {
privateInM1()
- internalInM1()
+ internalInM1()
publicInM1()
privateInM1Test()
- internalInM1Test()
+ internalInM1Test()
publicInM1Test()
privateInM2()
- internalInM2()
+ internalInM2()
publicInM2()
privateInM2Test()
- internalInM2Test()
+ internalInM2Test()
publicInM2Test()
privateInM3()
diff --git a/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt b/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
index f88dfb08d00..be295e86d80 100644
--- a/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
+++ b/idea/testData/multiModuleHighlighting/visibility/m2/m2.kt
@@ -5,20 +5,20 @@ import m1.*
fun testVisibility() {
PublicClassInM1()
- InternalClassInM1()
+ InternalClassInM1()
PrivateClassInM1()
publicFunInM1()
- internalFunInM1()
+ internalFunInM1()
privateFunInM1()
}
public class ClassInM2
-public class B: A() {
+public class B: A() {
fun accessA(a: A) {}
@@ -29,6 +29,6 @@ public class B: int()
+ int()
}
}
\ No newline at end of file