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

LT: make where clause with errors parsing same as with PSI

Browse Source 
- do not fail on the missing terms
- propagate invalid name to avoid reporting dangling constraints

#KT-58455 fixed
This commit is contained in:
Ilya Chernikov
2023-10-27 10:04:57 +02:00
committed by Space Team
parent 87563f3aea
commit 1d461684ae
9 changed files with 63 additions and 12 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
@@ -13972,6 +13972,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/generics/unresolvedClassifierInWhere.kt");
}
@Test
@TestMetadata("whereClauseSyntax.kt")
public void testWhereClauseSyntax() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt");
}
@Test
@TestMetadata("wildcardInValueParameter.kt")
public void testWildcardInValueParameter() 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
@@ -13972,6 +13972,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/generics/unresolvedClassifierInWhere.kt");
}
@Test
@TestMetadata("whereClauseSyntax.kt")
public void testWhereClauseSyntax() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt");
}
@Test
@TestMetadata("wildcardInValueParameter.kt")
public void testWildcardInValueParameter() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -13966,6 +13966,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/generics/unresolvedClassifierInWhere.kt");
}
@Test
@TestMetadata("whereClauseSyntax.kt")
public void testWhereClauseSyntax() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt");
}
@Test
@TestMetadata("wildcardInValueParameter.kt")
public void testWildcardInValueParameter() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -13972,6 +13972,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/generics/unresolvedClassifierInWhere.kt");
}
@Test
@TestMetadata("whereClauseSyntax.kt")
public void testWhereClauseSyntax() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt");
}
@Test
@TestMetadata("wildcardInValueParameter.kt")
public void testWildcardInValueParameter() throws Exception {
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt
+20 -11
View File
@@ -1975,18 +1975,22 @@ class LightTreeRawFirDeclarationBuilder(
* @see org.jetbrains.kotlin.parsing.KotlinParsing.parseTypeConstraint
*/
private fun convertTypeConstraint(typeConstraint: LighterASTNode): TypeConstraint {
lateinit var identifier: String
lateinit var firType: FirTypeRef
lateinit var referenceExpression: LighterASTNode
val diagnostic = ConeSimpleDiagnostic(
"Type parameter annotations are not allowed inside where clauses", DiagnosticKind.AnnotationNotAllowed,
)
var identifier: String? = null
var firType: FirTypeRef? = null
var referenceExpression: LighterASTNode? = null
val annotations = mutableListOf<FirAnnotation>()
typeConstraint.forEachChildren {
when (it.tokenType) {
ANNOTATION_ENTRY -> annotations += convertAnnotationEntry(it, diagnostic = diagnostic)
ANNOTATION_ENTRY -> {
annotations +=
convertAnnotationEntry(
it,
diagnostic = ConeSimpleDiagnostic(
"Type parameter annotations are not allowed inside where clauses", DiagnosticKind.AnnotationNotAllowed,
)
)
}
REFERENCE_EXPRESSION -> {
identifier = it.asText
referenceExpression = it
@@ -1995,7 +1999,12 @@ class LightTreeRawFirDeclarationBuilder(
}
}
return TypeConstraint(annotations, identifier, firType, referenceExpression.toFirSourceElement())
return TypeConstraint(
annotations,
identifier,
firType ?: buildErrorTypeRef { },
(referenceExpression ?: typeConstraint).toFirSourceElement()
)
}
/**
@@ -2391,8 +2400,8 @@ class LightTreeRawFirDeclarationBuilder(
) where T : FirDeclaration, T : FirTypeParameterRefsOwner {
val typeParamNames = typeParameters.map { it.name }.toSet()
val result = typeConstraints.mapNotNull { constraint ->
val name = constraint.identifier.nameAsSafeName()
if (!typeParamNames.contains(name)) {
val name = constraint.identifier?.nameAsSafeName()
if (name != null && !typeParamNames.contains(name)) {
DanglingTypeConstraint(name, constraint.source)
} else {
null
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef
class TypeConstraint(
val annotations: List<FirAnnotation>,
val identifier: String,
val identifier: String?,
val firTypeRef: FirTypeRef,
val source: KtSourceElement
)
compiler/testData/diagnostics/tests/generics/whereClauseSyntax.fir.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// DIAGNOSTICS: -DEBUG_INFO_MISSING_UNRESOLVED
interface I
fun <E> foo() where E: I {}
fun <E> fooE1() where <!SYNTAX!><!>: I {}
fun <E> fooE2() where E: <!SYNTAX, SYNTAX!><!>{}
fun <E> fooE3() where <!SYNTAX!><!>{}
compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// DIAGNOSTICS: -DEBUG_INFO_MISSING_UNRESOLVED
interface I
fun <E> foo() where E: I {}
fun <E> fooE1() where <!SYNTAX!><!>: I {}
fun <E> fooE2() where E: <!SYNTAX!><!>{}
fun <E> fooE3() where <!SYNTAX!><!>{}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -13972,6 +13972,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/generics/unresolvedClassifierInWhere.kt");
}
@Test
@TestMetadata("whereClauseSyntax.kt")
public void testWhereClauseSyntax() throws Exception {
runTest("compiler/testData/diagnostics/tests/generics/whereClauseSyntax.kt");
}
@Test
@TestMetadata("wildcardInValueParameter.kt")
public void testWildcardInValueParameter() throws Exception {