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

FIR: pass the qualified access source when reporting ErrorNamedReference

Browse Source 
Currently if there is an error in a function call, FIR would report the
entire expression if this call is qualified, but *only* the name if it's
not qualified. For example, assume the following two calls are all
contains some errors.

```
a.foo(1,2,3)
^^^^^^^^^^^^
bar(1,2,3)
^^^
```

The entire call of `foo` is reported since it's qualified. But only the
reference `bar` is reported since it's not qualified. This limits the
usage of position strategies because the IDE does not allow position
strategies to go outside of the initially reported PSI element
(org.jetbrains.kotlin.idea.fir.highlighter.KotlinHighLevelDiagnosticHighlightingPass#addDiagnostic).

This change passes both the original error named reference and the
surrounding qualified access expression and defer the decision of which
to use to the reporting logic.

For unresolved reference and checks on `super` keyword, the position
strategy should not highlight the surrounding parentheses. Hence a new
position strategy `REFERENCED_NAME_BY_QUALIFIED` is added.

In addition, this change also has the following side effect

* some diagnostics are no longer reported when there is a syntax error
  since the higher level structure does not exist when there is a syntax
  error
This commit is contained in:
Tianyu Geng
2021-03-07 16:10:29 -08:00
committed by Dmitriy Novozhilov
parent 8805675539
commit d6907222cd
53 changed files with 247 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.1.fir.kt
Vendored
+1 -1
View File
@@ -63,7 +63,7 @@ fun case3() {
*/
fun case4(marker : Marker?) {
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y=1)<!>
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!><!UNSAFE_CALL!>><!><!SYNTAX!><!>
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x=1)<!>><!SYNTAX!><!>
}
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.1.fir.kt
Vendored
+1 -1
View File
@@ -63,7 +63,7 @@ fun case3() {
*/
fun case4(marker: Marker?) {
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.foo; typeCall: function")!>foo(y = { 1 })<!>
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!><!UNSAFE_CALL!>><!><!SYNTAX!><!>
marker?.<!DEBUG_INFO_CALL("fqName: libPackage.Marker.invoke; typeCall: variable&invoke")!>foo(x = { 1 })<!>><!SYNTAX!><!>
}
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.4.fir.kt
Vendored
+4 -4
View File
@@ -26,9 +26,9 @@ import LibPackCase1.b.*
fun case1 (){
var b: B? = B()
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += { C() }<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> { C() }<!>
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += {1}<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> {1}<!>
}
class B {
@@ -63,9 +63,9 @@ import LibPackCase2.b.*
fun case2 (){
var b: B = B()
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += { C() }<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> { C() }<!>
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += {1}<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> {1}<!>
}
class B {
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.5.fir.kt
Vendored
+2 -2
View File
@@ -10,9 +10,9 @@ import LibPackCase1.a.*
import LibPackCase1.b.*
fun case1 (){
var b: B? = null
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += { C() }<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> { C() }<!>
<!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += {1}<!>
<!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b <!AMBIGUITY!>+=<!> {1}<!>
}
class B {
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.6.fir.kt
Vendored
+2 -2
View File
@@ -15,9 +15,9 @@ import LibPackCase1.b.*
fun case1 (){
var b: B? = B()
<!AMBIGUITY!>b += { C() }<!>
b <!AMBIGUITY!>+=<!> { C() }
<!AMBIGUITY!>b += {1}<!>
b <!AMBIGUITY!>+=<!> {1}
}
class B {
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.7.fir.kt
Vendored
+2 -2
View File
@@ -15,9 +15,9 @@ import LibPackCase1.b.plusAssign
fun case1 (){
var b: B? = B()
<!AMBIGUITY!>b += { C() }<!>
b <!AMBIGUITY!>+=<!> { C() }
<!AMBIGUITY!>b += {1}<!>
b <!AMBIGUITY!>+=<!> {1}
}
class B {
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.8.fir.kt
Vendored
+4 -4
View File
@@ -15,8 +15,8 @@ import LibPackCase1.b.plusAssign
fun case1 (){
var b: B = B()
<!AMBIGUITY!>b +={ C() }<!>
<!AMBIGUITY!>b +={ 1 }<!>
b <!AMBIGUITY!>+=<!>{ C() }
b <!AMBIGUITY!>+=<!>{ 1 }
}
class B
@@ -48,8 +48,8 @@ import LibPackCase2.b.plusAssign
fun case2 (){
var b: B = B()
<!AMBIGUITY!>b +={ C() }<!>
<!AMBIGUITY!>b +={ 1 }<!>
b <!AMBIGUITY!>+=<!>{ C() }
b <!AMBIGUITY!>+=<!>{ 1 }
b.<!AMBIGUITY!>plusAssign<!>{ C() }
}
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-17/neg/2.1.fir.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ operator fun I2.invoke(): String = TODO()
fun case1(a: A) {
a.<!AMBIGUITY!>invoke<!>()
<!AMBIGUITY!>a<!>()
<!AMBIGUITY!>A<!>()()
<!AMBIGUITY!>A()<!>()
}
// FILE: TestCase2.kt
compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-17/neg/2.2.fir.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ operator fun <R>I2.invoke(): String = TODO()
fun case1(a: A) {
a.<!AMBIGUITY!>invoke<!>()
<!AMBIGUITY!>a<!>()
<!AMBIGUITY!>A<!>()()
<!AMBIGUITY!>A()<!>()
}
// FILE: TestCase2.kt
compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/12.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@
fun case_1() {
var x: Int? = 11
x!!
try {x = null;} finally { <!UNRESOLVED_REFERENCE!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!> += 10<!>; }
try {x = null;} finally { <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x<!> <!UNRESOLVED_REFERENCE!>+=<!> 10; }
}
// TESTCASE NUMBER: 2