[FIR] Prepare FirFunctionParameterChecker to a future without context…

… receivers
JetBrains · Feb 12, 2025 · feeb3f8 · feeb3f8
1 parent 4e14319
commit feeb3f8
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 11 deletions.
diff --git a/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
diff --git a/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
diff --git a/...esolve/contextParameters/declarationAndUsages/anonymousFunctionContextWithoutType.fir.txt b/...esolve/contextParameters/declarationAndUsages/anonymousFunctionContextWithoutType.fir.txt
@@ -0,0 +1,9 @@
+FILE: anonymousFunctionContextWithoutType.kt
+    public final fun foo(f: R|@ContextFunctionTypeParams (kotlin/String) -> kotlin/String|): R|kotlin/Unit| {
+    }
+    public final fun test(): R|kotlin/Unit| {
+        R|/foo<Inapplicable(INAPPLICABLE): /foo>#|(context(c@<ERROR TYPE REF: Symbol not found for c>) fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            ^@foo <Unresolved name: c>#
+        }
+        )
+    }
diff --git a/...ata/resolve/contextParameters/declarationAndUsages/anonymousFunctionContextWithoutType.kt b/...ata/resolve/contextParameters/declarationAndUsages/anonymousFunctionContextWithoutType.kt
@@ -0,0 +1,9 @@
+// RUN_PIPELINE_TILL: FRONTEND
+// LANGUAGE: +ContextParameters
+
+fun foo(f: context(String) () -> String) {}
+
+fun test() {
+    // Should become green when context receivers are removed and we parse `c` as parameter without name instead of context receiver.
+    foo(<!ARGUMENT_TYPE_MISMATCH!>context(<!CONTEXT_PARAMETER_WITHOUT_NAME, UNRESOLVED_REFERENCE!>c<!>) fun() { return <!UNRESOLVED_REFERENCE!>c<!> }<!>)
+}
diff --git a/...ns/kotlin/test/runners/FirLightTreeDiagnosticsWithLatestLanguageVersionTestGenerated.java b/...ns/kotlin/test/runners/FirLightTreeDiagnosticsWithLatestLanguageVersionTestGenerated.java
diff --git a/...ests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java b/...ests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticLightTreeTestGenerated.java
diff --git a/...ests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java b/...ests/tests-gen/org/jetbrains/kotlin/test/runners/PhasedJvmDiagnosticPsiTestGenerated.java
diff --git a/...src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt b/...src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirFunctionParameterChecker.kt
@@ -51,18 +51,26 @@ object FirFunctionParameterChecker : FirFunctionChecker(MppCheckerKind.Common) {
     private fun checkParameterTypes(function: FirFunction, context: CheckerContext, reporter: DiagnosticReporter) {
         if (function is FirAnonymousFunction) return
         for (valueParameter in function.valueParameters) {
-            val returnTypeRef = valueParameter.returnTypeRef
-            if (returnTypeRef !is FirErrorTypeRef) continue
-            // type problems on real source are already reported by ConeDiagnostic.toFirDiagnostics
-            if (returnTypeRef.source?.kind == KtRealSourceElementKind) continue
+            checkParameterType(valueParameter, reporter, context)
+        }
+        for (valueParameter in function.contextParameters) {
+            checkParameterType(valueParameter, reporter, context)
+        }
+    }
 
-            val diagnostic = returnTypeRef.diagnostic
-            if (diagnostic is ConeSimpleDiagnostic && diagnostic.kind == DiagnosticKind.ValueParameterWithNoTypeAnnotation) {
-                reporter.reportOn(
-                    valueParameter.source, FirErrors.VALUE_PARAMETER_WITHOUT_EXPLICIT_TYPE,
-                    context
-                )
-            }
+    private fun checkParameterType(
+        valueParameter: FirValueParameter,
+        reporter: DiagnosticReporter,
+        context: CheckerContext,
+    ) {
+        val returnTypeRef = valueParameter.returnTypeRef
+        if (returnTypeRef !is FirErrorTypeRef) return
+        // type problems on real source are already reported by ConeDiagnostic.toFirDiagnostics
+        if (returnTypeRef.source?.kind == KtRealSourceElementKind) return
+
+        val diagnostic = returnTypeRef.diagnostic
+        if (diagnostic is ConeSimpleDiagnostic && diagnostic.kind == DiagnosticKind.ValueParameterWithNoTypeAnnotation) {
+            reporter.reportOn(valueParameter.source, FirErrors.VALUE_PARAMETER_WITHOUT_EXPLICIT_TYPE, context)
         }
     }