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

[FIR] Exclude class type arguments checks for type parameters from outer functions

Browse Source 
#KT-63577
This commit is contained in:
Evgeniy.Zhelenskiy
2024-01-18 06:19:55 +01:00
committed by Space Team
parent ff76837d35
commit dc578b1c5f
10 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -16932,6 +16932,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/inference/kt62609.kt");
}
@Test
@TestMetadata("kt63577.kt")
public void testKt63577() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/kt63577.kt");
}
@Test
@TestMetadata("kt63982.kt")
public void testKt63982() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -16932,6 +16932,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/inference/kt62609.kt");
}
@Test
@TestMetadata("kt63577.kt")
public void testKt63577() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/kt63577.kt");
}
@Test
@TestMetadata("kt63982.kt")
public void testKt63982() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -16926,6 +16926,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/inference/kt62609.kt");
}
@Test
@TestMetadata("kt63577.kt")
public void testKt63577() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/kt63577.kt");
}
@Test
@TestMetadata("kt63982.kt")
public void testKt63982() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -16932,6 +16932,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/inference/kt62609.kt");
}
@Test
@TestMetadata("kt63577.kt")
public void testKt63577() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/kt63577.kt");
}
@Test
@TestMetadata("kt63982.kt")
public void testKt63982() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirTypeArgumentsOfQualifierOfCallableReferenceChecker.kt
+2 -1
View File
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess
import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
import org.jetbrains.kotlin.fir.types.constructType
@@ -23,7 +24,7 @@ object FirTypeArgumentsOfQualifierOfCallableReferenceChecker : FirCallableRefere
val correspondingDeclaration = lhs.symbol ?: return
var typeArgumentsWithSourceInfo = lhs.typeArguments.toTypeArgumentsWithSourceInfo()
var typeParameterSymbols = correspondingDeclaration.typeParameterSymbols
var typeParameterSymbols = correspondingDeclaration.typeParameterSymbols.filter { it.containingDeclarationSymbol is FirClassLikeSymbol }
if (typeParameterSymbols.size != typeArgumentsWithSourceInfo.size) {
reporter.reportOn(
lhs.source,
compiler/testData/diagnostics/tests/callableReference/bareType.kt
Vendored
+3
View File
@@ -10,6 +10,9 @@ fun f2() = <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Map.Entry<!>::hashCode
class Outer<T> {
inner class Inner
class NotInner
}
fun f3() = <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Outer.Inner<!>::hashCode
fun f4() = Outer.NotInner::hashCode
compiler/testData/diagnostics/tests/callableReference/bareType.txt
Vendored
+9
View File
@@ -3,6 +3,7 @@ package
public fun f1(): kotlin.reflect.KFunction1<kotlin.collections.Map<*, *>, kotlin.Int>
public fun f2(): kotlin.reflect.KFunction1<kotlin.collections.Map.Entry<*, *>, kotlin.Int>
public fun f3(): kotlin.reflect.KFunction1<Outer<*>.Inner, kotlin.Int>
public fun f4(): kotlin.reflect.KFunction1<Outer.NotInner, kotlin.Int>
public final class Outer</*0*/ T> {
public constructor Outer</*0*/ T>()
@@ -16,4 +17,12 @@ public final class Outer</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class NotInner {
public constructor NotInner()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/inference/kt63577.fir.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// WITH_STDLIB
// FULL_JDK
fun <ItemType> setupListSpeedSearch() {
class MatchedItem(val item: ItemType)
class MatchedItem1<T>(val item: ItemType)
MatchedItem::class
MatchedItem::item
MatchedItem1::class
<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>MatchedItem1<!>::item
<!CLASS_LITERAL_LHS_NOT_A_CLASS!>MatchedItem1<Int>::class<!>
MatchedItem1<Int>::item
}
compiler/testData/diagnostics/tests/inference/kt63577.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// WITH_STDLIB
// FULL_JDK
fun <ItemType> setupListSpeedSearch() {
class MatchedItem(val item: ItemType)
class MatchedItem1<T>(val item: ItemType)
<!CLASS_LITERAL_LHS_NOT_A_CLASS!>MatchedItem::class<!>
MatchedItem::item
MatchedItem1::class
<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>MatchedItem1<!>::item
<!CLASS_LITERAL_LHS_NOT_A_CLASS!>MatchedItem1<Int>::class<!>
MatchedItem1<Int>::item
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -16932,6 +16932,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/inference/kt62609.kt");
}
@Test
@TestMetadata("kt63577.kt")
public void testKt63577() throws Exception {
runTest("compiler/testData/diagnostics/tests/inference/kt63577.kt");
}
@Test
@TestMetadata("kt63982.kt")
public void testKt63982() throws Exception {