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

Resolve invisible references and mark them 'invisible' instead of mark them 'unresolved'

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-05 18:36:36 +04:00
parent aa568a3ceb
commit 7863b1398e
13 changed files with 139 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/packageVisibility.jet
+4 -4
View File
@@ -12,13 +12,13 @@ val mc = MyJavaClass()
//FILE: b.kt
package b
import a.MyJavaClass
import a.<!INVISIBLE_REFERENCE!>MyJavaClass<!>
val mc1 = <!UNRESOLVED_REFERENCE!>MyJavaClass<!>()
val mc1 = <!INVISIBLE_MEMBER!>MyJavaClass<!>()
//FILE: c.kt
package a.c
import a.MyJavaClass
import a.<!INVISIBLE_REFERENCE!>MyJavaClass<!>
val mc1 = <!UNRESOLVED_REFERENCE!>MyJavaClass<!>()
val mc1 = <!INVISIBLE_MEMBER!>MyJavaClass<!>()
compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.jet
+4 -4
View File
@@ -6,13 +6,13 @@ package example;
fun test() {
val p = test.Public()
if (p.public is Int) <!AUTOCAST_IMPOSSIBLE!>p.public<!> + 1
if (p.<!UNRESOLVED_REFERENCE!>protected<!> is Int) p.<!UNRESOLVED_REFERENCE!>protected<!> + 1
if (p.<!UNRESOLVED_REFERENCE!>i_protected<!> is Int) p.<!UNRESOLVED_REFERENCE!>i_protected<!> + 1
if (p.<!INVISIBLE_MEMBER!>protected<!> is Int) <!AUTOCAST_IMPOSSIBLE!>p.<!INVISIBLE_MEMBER!>protected<!><!> + 1
if (p.<!INVISIBLE_MEMBER!>i_protected<!> is Int) p.<!INVISIBLE_MEMBER!>i_protected<!> + 1
if (p.internal is Int) p.internal + 1
val i = test.Public()
if (i.public is Int) <!AUTOCAST_IMPOSSIBLE!>i.public<!> + 1
if (i.<!UNRESOLVED_REFERENCE!>protected<!> is Int) i.<!UNRESOLVED_REFERENCE!>protected<!> + 1
if (i.<!UNRESOLVED_REFERENCE!>i_protected<!> is Int) i.<!UNRESOLVED_REFERENCE!>i_protected<!> + 1
if (i.<!INVISIBLE_MEMBER!>protected<!> is Int) <!AUTOCAST_IMPOSSIBLE!>i.<!INVISIBLE_MEMBER!>protected<!><!> + 1
if (i.<!INVISIBLE_MEMBER!>i_protected<!> is Int) i.<!INVISIBLE_MEMBER!>i_protected<!> + 1
if (i.internal is Int) i.internal + 1
}
compiler/testData/diagnostics/tests/scopes/kt37.jet
+1 -1
View File
@@ -11,6 +11,6 @@ class C() {
fun box(): String {
val c = C()
if (c.<!UNRESOLVED_REFERENCE!>f<!> != 610) return "fail"
if (c.<!INVISIBLE_MEMBER!>f<!> != 610) return "fail"
return "OK"
}
compiler/testData/diagnostics/tests/scopes/visibility.jet
+6 -6
View File
@@ -35,8 +35,8 @@ class B {
}
fun test3(a: A) {
a.<!UNRESOLVED_REFERENCE!>v<!> //todo .bMethod()
a.<!UNRESOLVED_REFERENCE!>f<!>(0, 1) //todo .bMethod()
a.<!INVISIBLE_MEMBER!>v<!> //todo .bMethod()
a.<!INVISIBLE_MEMBER!>f<!>(0, 1) //todo .bMethod()
}
trait T
@@ -49,7 +49,7 @@ open class C : T {
}
fun test4(c: C) {
c.<!UNRESOLVED_REFERENCE!>i<!>++
c.<!INVISIBLE_MEMBER!>i<!>++
}
class D : C() {
@@ -73,7 +73,7 @@ class F : C() {
class G : T {
fun test8(c: C) {
doSmth(c.<!UNRESOLVED_REFERENCE!>i<!>)
doSmth(c.<!INVISIBLE_MEMBER!>i<!>)
}
}
@@ -86,5 +86,5 @@ import test_visibility.*
fun test() {
internal_fun()
<!UNRESOLVED_REFERENCE!>private_fun<!>()
}
<!INVISIBLE_MEMBER!>private_fun<!>()
}
compiler/testData/diagnostics/tests/scopes/visibility2.jet
+11 -8
View File
@@ -15,20 +15,23 @@ private object PO {}
//+JDK
package b
import a.*
import a.<!INVISIBLE_REFERENCE!>A<!>
import a.<!INVISIBLE_REFERENCE!>foo<!>
import a.makeA
import a.<!INVISIBLE_REFERENCE!>PO<!>
fun test() {
val y = makeA()
y.<!UNRESOLVED_REFERENCE!>bar<!>()
<!UNRESOLVED_REFERENCE!>foo<!>()
y.<!INVISIBLE_MEMBER!>bar<!>()
<!INVISIBLE_MEMBER!>foo<!>()
val <!UNUSED_VARIABLE!>u<!> : <!INVISIBLE_MEMBER!>A<!> = <!UNRESOLVED_REFERENCE!>A<!>()
val <!UNUSED_VARIABLE!>a<!> : java.util.Arrays.<!INVISIBLE_MEMBER!>ArrayList<!><Int>;
val <!UNUSED_VARIABLE!>u<!> : <!INVISIBLE_REFERENCE!>A<!> = <!INVISIBLE_MEMBER!>A<!>()
val <!UNUSED_VARIABLE!>a<!> : java.util.Arrays.<!INVISIBLE_REFERENCE!>ArrayList<!><Int>;
val <!UNUSED_VARIABLE!>po<!> = <!UNRESOLVED_REFERENCE!>PO<!>()
val <!UNUSED_VARIABLE!>po<!> = <!INVISIBLE_MEMBER!>PO<!>
}
class B : <!INVISIBLE_MEMBER!>A<!>() {}
class B : <!INVISIBLE_REFERENCE, INVISIBLE_MEMBER!>A<!>() {}
class Q {
class W {
@@ -41,4 +44,4 @@ class Q {
//check that 'toString' can be invoked without specifying return type
class NewClass : java.util.ArrayList<Integer>() {
public override fun toString() = "a"
}
}