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/resolve/invoke/errors/invisibleInvoke.fir.kt
Vendored
+2 -2
View File
@@ -5,6 +5,6 @@ class My {
}
fun My.foo(i: Int) {
<!INAPPLICABLE_CANDIDATE!>i<!>("")
<!INAPPLICABLE_CANDIDATE!>1("")<!>
<!HIDDEN!>i<!>("")
<!HIDDEN!>1("")<!>
}
compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
Vendored
+2 -2
View File
@@ -7,8 +7,8 @@ fun Int.invoke(a: Int, b: Int) {}
class SomeClass
fun test(identifier: SomeClass, fn: String.() -> Unit) {
<!INAPPLICABLE_CANDIDATE!>identifier<!>()
<!NONE_APPLICABLE!>identifier<!>()
<!INAPPLICABLE_CANDIDATE!>identifier<!>(123)
<!INAPPLICABLE_CANDIDATE!>identifier<!>(1, 2)
1.<!INAPPLICABLE_CANDIDATE!>fn<!>()
}
}
compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
Vendored
+2 -2
View File
@@ -80,7 +80,7 @@ operator fun <T> Foo6<T>.invoke(x: Int) {}
fun main(x: Bar6<String>?) {
x?.value(1)
x?.value.<!INAPPLICABLE_CANDIDATE!>invoke<!>(1)
x?.value.<!NONE_APPLICABLE!>invoke<!>(1)
}
// Test case 7: top-level generic invoke and invoke with compatible additional dispatch recevier
@@ -108,7 +108,7 @@ operator fun Foo8<String>.invoke(x: Int) {}
fun main(x: Bar8<String>?) {
x?.value(1)
x?.value.<!INAPPLICABLE_CANDIDATE!>invoke<!>(1)
x?.value.<!NONE_APPLICABLE!>invoke<!>(1)
}
// Test case 9: additional receiver, generic invoke with pure type perameter receiver
compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ fun test(a: A, b: B) {
b.(foo)()
<!UNRESOLVED_REFERENCE!>(b.<!INAPPLICABLE_CANDIDATE!>foo<!>)()<!>
<!INAPPLICABLE_CANDIDATE!>(b.<!INAPPLICABLE_CANDIDATE!>foo<!>)()<!>
foo(b)
(foo)(b)
compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ fun foo(i: Int) = i
fun foo(s: String) = s
fun test() {
<!INAPPLICABLE_CANDIDATE!>foo<!>(emptyList())
<!NONE_APPLICABLE!>foo<!>(emptyList())
}
fun <T> emptyList(): List<T> {throw Exception()}
fun <T> emptyList(): List<T> {throw Exception()}
compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.fir.kt
Vendored
+14 -14
View File
@@ -19,20 +19,20 @@ class E {
// `bar` calls are inapplicable since both E nor D aren't proper receivers
// But prior to this change, every lambda was analyzed repeatedly for every candidate
// Thus, the resulting time was exponential
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!INAPPLICABLE_CANDIDATE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
<!NONE_APPLICABLE!>bar<!> {
}
}
compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.fir.kt
Vendored
+2 -2
View File
@@ -9,11 +9,11 @@ fun test() {
val interface_as_fun = <!UNRESOLVED_REFERENCE!>A<!>()
val interface_as_val = A
val object_as_fun = <!INAPPLICABLE_CANDIDATE!>B<!>()
val object_as_fun = <!HIDDEN!>B<!>()
val class_as_val = C
}
fun <T> bar() {
val typeParameter_as_val = <!OTHER_ERROR, OTHER_ERROR!>T<!>
val typeParameter_as_fun = <!UNRESOLVED_REFERENCE!>T<!>()
}
}
compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.fir.kt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@ fun testX() {
val interface_as_fun = X.<!UNRESOLVED_REFERENCE!>A<!>()
val interface_as_val = X.A
val object_as_fun = X.<!INAPPLICABLE_CANDIDATE!>B<!>()
val object_as_fun = X.<!HIDDEN!>B<!>()
val class_as_val = X.C
}
@@ -26,7 +26,7 @@ fun testY() {
val interface_as_fun = Y.<!UNRESOLVED_REFERENCE!>A<!>()
val interface_as_val = Y.A
val object_as_fun = Y.<!INAPPLICABLE_CANDIDATE!>B<!>()
val object_as_fun = Y.<!HIDDEN!>B<!>()
val class_as_val = Y.C
}
@@ -36,4 +36,4 @@ fun test(x: X) {
val object_as_fun = x.<!UNRESOLVED_REFERENCE!>B<!>()
val class_as_val = x.C
}
}
compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.fir.kt
Vendored
+1 -1
View File
@@ -8,6 +8,6 @@ fun overloadedFun(arg: String, vararg args: String) = X1
fun overloadedFun(arg: String, vararg args: String, flag: Boolean = true) = X2
val test1a: X1 = overloadedFun("", "")
val test1b: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun<!>("", args = "")
val test1b: X1 = <!NONE_APPLICABLE!>overloadedFun<!>("", args = "")
val test1c: X2 = overloadedFun("", "", "", flag = true)
compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.fir.kt
Vendored
+2 -2
View File
@@ -9,5 +9,5 @@ fun overloadedFun5(s: String, vararg ss: String) = X2
val test1 = overloadedFun5("")
val test2 = overloadedFun5("", "")
val test3: X2 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(s = "", ss = "")
val test4: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(ss = "")
val test3: X2 = <!NONE_APPLICABLE!>overloadedFun5<!>(s = "", ss = "")
val test4: X1 = <!INAPPLICABLE_CANDIDATE!>overloadedFun5<!>(ss = "")
compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
Vendored
+3 -3
View File
@@ -23,15 +23,15 @@ fun testDataFlowInfo1(a: Int?, b: Int?) {
val c: Int = a ?: b!!
doInt(c)
// b is nullable if a != null
b <!INAPPLICABLE_CANDIDATE!>+<!> 1
b <!NONE_APPLICABLE!>+<!> 1
}
fun testDataFlowInfo2(a: Int?, b: Int?) {
doInt(a ?: b!!)
// b is nullable if a != null
b <!INAPPLICABLE_CANDIDATE!>+<!> 1
b <!NONE_APPLICABLE!>+<!> 1
}
fun testTypeMismatch(a: String?, b: Any) {
<!INAPPLICABLE_CANDIDATE!>doInt<!>(a ?: b)
}
}