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

K2: report MISSING_DEPENDENCY_CLASS in case of error type of expression

Browse Source 
This commit is intended to get a more clear diagnostic in case when
the type checker creates an inconsistent error type due to some
classifier inaccessibility. Before this commit, we reported simply
ARGUMENT_TYPE_MISMATCH (see test). Now we report also
MISSING_DEPENDENCY_CLASS by analyzing an error type of a qualified
expression.

#KT-66356 Fixed
This commit is contained in:
Mikhail Glukhikh
2024-03-18 12:19:55 +01:00
committed by Space Team
parent 2d755aabe7
commit 3fbb7bc920
7 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/javac/Lambda.fir.diag.txt
Vendored
+10
View File
@@ -1,7 +1,17 @@
/Call.kt:(232,241): error: Cannot access class 'com.result.B'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(253,262): error: Cannot access class 'com.result.B'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(271,280): error: Cannot access class 'com.result.B'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(294,296): error: Cannot access class 'com.result.B'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(316,334): error: Cannot access class 'com.result.Owner.Nested'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(316,334): error: Cannot access class 'com.result.Owner.Nested.VeryNested'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(337,345): error: Cannot access class 'com.result.Owner.Nested'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(346,355): error: Cannot access class 'com.result.Owner.Nested.VeryNested'. Check your module classpath for missing or conflicting dependencies.
/Call.kt:(383,389): error: Unresolved reference 'result'.
compiler/testData/diagnostics/tests/javac/Lambda.fir.kt
Vendored
+3 -3
View File
@@ -81,9 +81,9 @@ import com.repo.request_withNested
class Model {
fun call() {
request_a().mapError <!MISSING_DEPENDENCY_CLASS!>{ 1 + 1 }<!>
request_a().mapError { <!MISSING_DEPENDENCY_CLASS!>it<!> -> 1 + 1 }
request_withNested().mapError <!MISSING_DEPENDENCY_CLASS!>{ 1 + 1 }<!>
<!MISSING_DEPENDENCY_CLASS!>request_a<!>().mapError <!MISSING_DEPENDENCY_CLASS!>{ 1 + 1 }<!>
<!MISSING_DEPENDENCY_CLASS!>request_a<!>().mapError { <!MISSING_DEPENDENCY_CLASS!>it<!> -> 1 + 1 }
<!MISSING_DEPENDENCY_CLASS, MISSING_DEPENDENCY_CLASS!>request_withNested<!>().<!MISSING_DEPENDENCY_CLASS!>mapError<!> <!MISSING_DEPENDENCY_CLASS!>{ 1 + 1 }<!>
}
}
compiler/testData/diagnostics/tests/multimodule/BoxedInaccessibleGenericTypeUsedByDependencies.diag.txt
Vendored
+5
View File
@@ -0,0 +1,5 @@
// -- Module: <missing> --
// -- Module: <library> --
// -- Module: <main> --
compiler/testData/diagnostics/tests/multimodule/BoxedInaccessibleGenericTypeUsedByDependencies.fir.diag.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
/module_main_BoxedInaccessibleGenericTypeUsedByDependencies.fir.kt:(84,112): error: Cannot access class 'InaccessibleType'. Check your module classpath for missing or conflicting dependencies.
/module_main_BoxedInaccessibleGenericTypeUsedByDependencies.fir.kt:(84,114): error: Argument type mismatch: actual type is 'Box<CapturedType(out ERROR CLASS: Inconsistent type: InaccessibleType<kotlin/Any?> (parameters.size = 0, arguments.size = 1))>', but 'Box<InaccessibleType<kotlin.Any?>>' was expected.
compiler/testData/diagnostics/tests/multimodule/BoxedInaccessibleGenericTypeUsedByDependencies.fir.kt
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// RENDER_DIAGNOSTICS_FULL_TEXT
// MODULE: missing
class InaccessibleType<ITTP>
@@ -12,5 +13,5 @@ fun consumeBoxedInaccessibleType(arg: Box<InaccessibleType<Any?>>) {}
// MODULE: main(library)
fun test() {
consumeBoxedInaccessibleType(<!ARGUMENT_TYPE_MISMATCH("Box<InaccessibleType<kotlin.Any?>>; Box<CapturedType(out ERROR CLASS: Inconsistent type: InaccessibleType<kotlin/Any?> (parameters.size = 0, arguments.size = 1))>")!>produceBoxedInaccessibleType()<!>)
consumeBoxedInaccessibleType(<!ARGUMENT_TYPE_MISMATCH!><!MISSING_DEPENDENCY_CLASS!>produceBoxedInaccessibleType<!>()<!>)
}
compiler/testData/diagnostics/tests/multimodule/BoxedInaccessibleGenericTypeUsedByDependencies.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// RENDER_DIAGNOSTICS_FULL_TEXT
// MODULE: missing
class InaccessibleType<ITTP>