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

[FIR] Improve diagnostic reporting & don't use error symbol for candidate if possible

Browse Source 
Also introduce few new diagnostics:
- NONE_APPLICABLE more many inapplicable candidates
- HIDDEN for visible candidates
This commit is contained in:
Dmitriy Novozhilov
2020-07-22 16:40:14 +03:00
committed by Mikhail Glukhikh
parent 5c0528b61e
commit f283f2db43
365 changed files with 1400 additions and 1451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt
Vendored
+3 -3
View File
@@ -19,15 +19,15 @@ open class A {
fun fromOutside() {
devNull(A.internal_val)
devNull(A.public_val)
devNull(A.<!INAPPLICABLE_CANDIDATE!>private_val<!>)
devNull(A.<!INAPPLICABLE_CANDIDATE!>protected_val<!>)
devNull(A.<!HIDDEN!>private_val<!>)
devNull(A.<!HIDDEN!>protected_val<!>)
}
class B: A() {
fun fromSubclass() {
devNull(A.internal_val)
devNull(A.public_val)
devNull(A.<!INAPPLICABLE_CANDIDATE!>private_val<!>)
devNull(A.<!HIDDEN!>private_val<!>)
devNull(A.protected_val)
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.fir.kt
Vendored
+2 -2
View File
@@ -23,8 +23,8 @@ class B extends A {
// FILE: test.kt
fun test() {
A.<!INAPPLICABLE_CANDIDATE!>a<!>
A.<!INAPPLICABLE_CANDIDATE!>foo<!>()
A.<!HIDDEN!>a<!>
A.<!HIDDEN!>foo<!>()
A.b
A.bar()
B.a
compiler/testData/diagnostics/tests/scopes/kt1244.fir.kt
Vendored
+2 -2
View File
@@ -8,6 +8,6 @@ class A {
class B() {
init {
A().<!INAPPLICABLE_CANDIDATE!>a<!> = "Hello"
A().<!HIDDEN!>a<!> = "Hello"
}
}
}
compiler/testData/diagnostics/tests/scopes/kt1738.fir.kt
Vendored
+2 -2
View File
@@ -6,6 +6,6 @@ class A(private var i: Int, var j: Int) {
}
fun test(a: A) {
a.<!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>i<!><!UNRESOLVED_REFERENCE!>++<!>
a.<!HIDDEN, HIDDEN!>i<!>++
a.j++
}
}
compiler/testData/diagnostics/tests/scopes/kt1805.fir.kt
Vendored
+4 -4
View File
@@ -7,14 +7,14 @@ open class Some {
class SomeSubclass : Some() {
fun test() {
this.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 1. Unresolved reference
this.<!HIDDEN!>privateField<!> // 1. Unresolved reference
}
}
fun test() {
val s2 = Some()
s2.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 2. Can't access to 'privateField' in Some
s2.<!HIDDEN!>privateField<!> // 2. Can't access to 'privateField' in Some
val s1 = SomeSubclass()
s1.<!INAPPLICABLE_CANDIDATE!>privateField<!> // 3. Unresolved reference
}
s1.<!HIDDEN!>privateField<!> // 3. Unresolved reference
}
compiler/testData/diagnostics/tests/scopes/kt1806.fir.kt
Vendored
+3 -3
View File
@@ -8,7 +8,7 @@ object MyObject {
fun test1() {
doSmth(MyObject.<!INAPPLICABLE_CANDIDATE!>message<!>)
doSmth(MyObject.<!HIDDEN!>message<!>)
}
class Test {
@@ -17,8 +17,8 @@ class Test {
}
fun test2() {
doSmth(MyObject1.<!INAPPLICABLE_CANDIDATE!>message<!>)
doSmth(MyObject1.<!HIDDEN!>message<!>)
}
}
fun doSmth(s: String) = s
fun doSmth(s: String) = s
compiler/testData/diagnostics/tests/scopes/kt1942.fir.kt
Vendored
+1 -1
View File
@@ -14,6 +14,6 @@ import a.C
class A : C() {
fun test() {
val v = <!INAPPLICABLE_CANDIDATE!>myValue<!>
val v = <!HIDDEN!>myValue<!>
}
}
compiler/testData/diagnostics/tests/scopes/kt37.fir.kt
Vendored
+2 -2
View File
@@ -11,6 +11,6 @@ class C() {
fun box(): String {
val c = C()
if (c.<!INAPPLICABLE_CANDIDATE!>f<!> != 610) return "fail"
if (c.<!HIDDEN!>f<!> != 610) return "fail"
return "OK"
}
}
compiler/testData/diagnostics/tests/scopes/kt9430.fir.kt
Vendored
+2 -2
View File
@@ -12,5 +12,5 @@ class C: A() {
}
class D {
fun qux() { B().<!INAPPLICABLE_CANDIDATE!>foo<!>() }
}
fun qux() { B().<!HIDDEN!>foo<!>() }
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/innerProtectedClass.fir.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ class Foo : BaseClass() {
fun bar() {
val f = foo()
f.x
f.<!INAPPLICABLE_CANDIDATE!>y<!>
f.<!HIDDEN!>y<!>
}
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/javaInheritedInKotlin.fir.kt
Vendored
+6 -6
View File
@@ -39,20 +39,20 @@ class KotlinClass2 : JavaClass() {
}
fun test(a: KotlinClass, b: KotlinClass2) {
a.<!INAPPLICABLE_CANDIDATE!>foo<!>() // Error, protected_and_package declared in different package
a.<!HIDDEN!>foo<!>() // Error, protected_and_package declared in different package
b.foo() // Error, protected visibility in same package (but could be protected_and_package)
a.<!INAPPLICABLE_CANDIDATE!>field<!>
a.<!HIDDEN!>field<!>
JavaClass.<!INAPPLICABLE_CANDIDATE!>bar1<!>()
JavaClass.<!INAPPLICABLE_CANDIDATE!>CONST1<!>
JavaClass.<!HIDDEN!>bar1<!>()
JavaClass.<!HIDDEN!>CONST1<!>
KotlinClass.<!UNRESOLVED_REFERENCE!>bar1<!>() // Currently it's unresolved, but it should be prohibited even in case it would be resolved
KotlinClass.<!UNRESOLVED_REFERENCE!>CONST1<!>
JavaClassSamePackage.<!INAPPLICABLE_CANDIDATE!>bar1<!>()
JavaClassSamePackage.<!HIDDEN!>bar1<!>()
JavaClassSamePackage.bar2()
JavaClassSamePackage.<!INAPPLICABLE_CANDIDATE!>CONST1<!>
JavaClassSamePackage.<!HIDDEN!>CONST1<!>
JavaClassSamePackage.CONST2
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/protectedCallOnSubClass.fir.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ open class A {
fun bar(x: B) {
x.foo() // OK, foo declared in A
x.<!INAPPLICABLE_CANDIDATE!>baz<!>() // Declared in B
x.<!HIDDEN!>baz<!>() // Declared in B
x.foobaz() // Declared in B
}
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticPropertyExtensions.fir.kt
Vendored
+1 -1
View File
@@ -40,6 +40,6 @@ class B : A() {
}
fun baz(a: A) {
a.<!INAPPLICABLE_CANDIDATE!>foo<!>
a.<!HIDDEN!>foo<!>
a.bar = a.bar + ""
}
compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
Vendored
+1 -1
View File
@@ -27,5 +27,5 @@ class B : A() {
}
fun baz(a: A) {
a.<!INAPPLICABLE_CANDIDATE!>foo<!> { }
a.<!HIDDEN!>foo<!> { }
}
compiler/testData/diagnostics/tests/scopes/visibility.fir.kt
Vendored
+5 -5
View File
@@ -40,8 +40,8 @@ class B {
}
fun test3(a: A) {
a.<!INAPPLICABLE_CANDIDATE!>v<!> //todo .bMethod()
a.<!INAPPLICABLE_CANDIDATE!>f<!>(0, 1) //todo .bMethod()
a.<!HIDDEN!>v<!> //todo .bMethod()
a.<!HIDDEN!>f<!>(0, 1) //todo .bMethod()
}
interface T
@@ -54,7 +54,7 @@ open class C : T {
}
fun test4(c: C) {
c.<!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>i<!><!UNRESOLVED_REFERENCE!>++<!>
c.<!HIDDEN, HIDDEN!>i<!>++
}
class D : C() {
@@ -78,7 +78,7 @@ class F : C() {
class G : T {
fun test8(c: C) {
doSmth(c.<!INAPPLICABLE_CANDIDATE!>i<!>)
doSmth(c.<!HIDDEN!>i<!>)
}
}
@@ -91,5 +91,5 @@ import test_visibility.*
fun test() {
internal_fun()
<!INAPPLICABLE_CANDIDATE!>private_fun<!>()
<!HIDDEN!>private_fun<!>()
}
compiler/testData/diagnostics/tests/scopes/visibility2.fir.kt
Vendored
+4 -4
View File
@@ -25,15 +25,15 @@ import a.PO
fun test() {
val y = makeA()
y.bar()
<!INAPPLICABLE_CANDIDATE!>foo<!>()
<!HIDDEN!>foo<!>()
val u : A = <!INAPPLICABLE_CANDIDATE!>A<!>()
val u : A = <!HIDDEN!>A<!>()
val a : java.util.Arrays.ArrayList<Int>;
val po = <!INAPPLICABLE_CANDIDATE!>PO<!>
val po = PO
}
class B : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>A<!>() {}
class B : <!EXPOSED_SUPER_CLASS, HIDDEN!>A<!>() {}
class Q {
class W {
compiler/testData/diagnostics/tests/scopes/visibility3.fir.kt
Vendored
+6 -6
View File
@@ -26,17 +26,17 @@ package a
fun test() {
val y = makeA()
y.bar()
<!INAPPLICABLE_CANDIDATE!>foo<!>()
<!HIDDEN!>foo<!>()
val u : A = <!INAPPLICABLE_CANDIDATE!>A<!>()
val u : A = <!HIDDEN!>A<!>()
val z = <!INAPPLICABLE_CANDIDATE!>x<!>
<!INAPPLICABLE_CANDIDATE!>x<!> = 30
val z = <!HIDDEN!>x<!>
<!HIDDEN!>x<!> = 30
val po = <!INAPPLICABLE_CANDIDATE!>PO<!>
val po = PO
}
class B : <!EXPOSED_SUPER_CLASS, INAPPLICABLE_CANDIDATE!>A<!>() {}
class B : <!EXPOSED_SUPER_CLASS, HIDDEN!>A<!>() {}
class Q {
class W {