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

[FIR] Check typealiases in supertypes

Browse Source 
^KT-59830 Fixed

Merge-request: KT-MR-11187
Merged-by: Nikolay Lunyak <Nikolay.Lunyak@jetbrains.com>
This commit is contained in:
Nikolay Lunyak
2023-07-20 12:50:06 +00:00
committed by Space Team
parent 8a645e9c0a
commit 84dd1acec1
10 changed files with 51 additions and 19 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
@@ -339,6 +339,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt");
}
@Test
@TestMetadata("finalSupertype.kt")
public void testFinalSupertype() throws Exception {
runTest("compiler/testData/diagnostics/tests/finalSupertype.kt");
}
@Test
@TestMetadata("ForRangeConventions.kt")
public void testForRangeConventions() 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
@@ -339,6 +339,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt");
}
@Test
@TestMetadata("finalSupertype.kt")
public void testFinalSupertype() throws Exception {
runTest("compiler/testData/diagnostics/tests/finalSupertype.kt");
}
@Test
@TestMetadata("ForRangeConventions.kt")
public void testForRangeConventions() throws Exception {
compiler/fir/analysis-tests/testData/resolve/multifile/TypeAliasExpansion.kt
Vendored
+1 -1
View File
@@ -12,4 +12,4 @@ package a
import b.TA
class MyClass : TA()
class MyClass : <!FINAL_SUPERTYPE!>TA<!>()
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -339,6 +339,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt");
}
@Test
@TestMetadata("finalSupertype.kt")
public void testFinalSupertype() throws Exception {
runTest("compiler/testData/diagnostics/tests/finalSupertype.kt");
}
@Test
@TestMetadata("ForRangeConventions.kt")
public void testForRangeConventions() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -339,6 +339,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt");
}
@Test
@TestMetadata("finalSupertype.kt")
public void testFinalSupertype() throws Exception {
runTest("compiler/testData/diagnostics/tests/finalSupertype.kt");
}
@Test
@TestMetadata("ForRangeConventions.kt")
public void testForRangeConventions() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypesChecker.kt
+11 -12
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirField
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
import org.jetbrains.kotlin.fir.declarations.utils.modality
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.languageVersionSettings
@@ -55,14 +56,17 @@ object FirSupertypesChecker : FirClassChecker() {
reporter.reportOn(superTypeRef.source, FirErrors.SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE, context)
extensionFunctionSupertypeReported = true
}
val lookupTag = (coneType as? ConeClassLikeType)?.lookupTag ?: continue
val superTypeSymbol = lookupTag.toSymbol(context.session)
if (superTypeSymbol is FirRegularClassSymbol) {
if (!superClassSymbols.add(superTypeSymbol)) {
checkAnnotationOnSuperclass(superTypeRef, context, reporter)
val fullyExpandedType = coneType.fullyExpandedType(context.session)
val symbol = fullyExpandedType.toSymbol(context.session)
if (symbol is FirRegularClassSymbol) {
if (!superClassSymbols.add(symbol)) {
reporter.reportOn(superTypeRef.source, FirErrors.SUPERTYPE_APPEARS_TWICE, context)
}
if (superTypeSymbol.classKind != ClassKind.INTERFACE) {
if (symbol.classKind != ClassKind.INTERFACE) {
if (classAppeared) {
reporter.reportOn(superTypeRef.source, FirErrors.MANY_CLASSES_IN_SUPERTYPE_LIST, context)
} else {
@@ -73,8 +77,8 @@ object FirSupertypesChecker : FirClassChecker() {
interfaceWithSuperclassReported = true
}
}
val isObject = superTypeSymbol.classKind == ClassKind.OBJECT
if (!finalSupertypeReported && !isObject && superTypeSymbol.modality == Modality.FINAL) {
val isObject = symbol.classKind == ClassKind.OBJECT
if (!finalSupertypeReported && !isObject && symbol.modality == Modality.FINAL) {
reporter.reportOn(superTypeRef.source, FirErrors.FINAL_SUPERTYPE, context)
finalSupertypeReported = true
}
@@ -84,11 +88,6 @@ object FirSupertypesChecker : FirClassChecker() {
}
}
checkAnnotationOnSuperclass(superTypeRef, context, reporter)
val fullyExpandedType = coneType.fullyExpandedType(context.session)
val symbol = fullyExpandedType.toSymbol(context.session)
checkClassCannotBeExtendedDirectly(symbol, reporter, superTypeRef, context)
if (coneType.typeArguments.isNotEmpty()) {
compiler/testData/diagnostics/tests/finalSupertype.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// FIR_IDENTICAL
// ISSUE: KT-59830
class OOO
typealias Alias = OOO
class Child : <!FINAL_SUPERTYPE!>Alias<!>() //K1: [FINAL_SUPERTYPE] This type is final, so it cannot be inherited from, no error in K2
compiler/testData/diagnostics/tests/typealias/inSupertypesList.fir.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
interface IBase
typealias B = IBase
class Test1 : B
class Test2 : IBase, B
compiler/testData/diagnostics/tests/typealias/inSupertypesList.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
interface IBase
typealias B = IBase
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -339,6 +339,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt");
}
@Test
@TestMetadata("finalSupertype.kt")
public void testFinalSupertype() throws Exception {
runTest("compiler/testData/diagnostics/tests/finalSupertype.kt");
}
@Test
@TestMetadata("ForRangeConventions.kt")
public void testForRangeConventions() throws Exception {