From 7587f738464e05e601834306ea3c39273d558c4c Mon Sep 17 00:00:00 2001 From: "anzhela.sukhanova" Date: Thu, 18 Jan 2024 08:27:31 +0000 Subject: [PATCH] [Test] KT-61937: add tests with context functions and naming clash Update tests for ^KT-61937 Merge-request: KT-MR-13678 Merged-by: Anzhela Sukhanova --- ...icCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...nosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ ...TreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ ...rPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../lambdaReceiverFromContext.fir.kt | 6 ++++++ .../lambdaReceiverFromContext.kt | 6 ++++++ ...ambdaReceiverFromContextWithSameFunctions.kt | 17 +++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++++++ 8 files changed, 59 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index 350f77c9688..c02c59f5044 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -13569,6 +13569,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt"); } + @Test + @TestMetadata("lambdaReceiverFromContextWithSameFunctions.kt") + public void testLambdaReceiverFromContextWithSameFunctions() throws Exception { + runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt"); + } + @Test @TestMetadata("lazy.kt") public void testLazy() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index 2499c05023c..d846e9f88ca 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -13569,6 +13569,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt"); } + @Test + @TestMetadata("lambdaReceiverFromContextWithSameFunctions.kt") + public void testLambdaReceiverFromContextWithSameFunctions() throws Exception { + runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt"); + } + @Test @TestMetadata("lazy.kt") public void testLazy() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index 5721610fcba..737366797df 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -13563,6 +13563,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt"); } + @Test + @TestMetadata("lambdaReceiverFromContextWithSameFunctions.kt") + public void testLambdaReceiverFromContextWithSameFunctions() throws Exception { + runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt"); + } + @Test @TestMetadata("lazy.kt") public void testLazy() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index b0a93ebb20e..68189e8378b 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -13569,6 +13569,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt"); } + @Test + @TestMetadata("lambdaReceiverFromContextWithSameFunctions.kt") + public void testLambdaReceiverFromContextWithSameFunctions() throws Exception { + runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt"); + } + @Test @TestMetadata("lazy.kt") public void testLazy() throws Exception { diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.fir.kt index cd5ccf402fa..0c78e5b35f9 100644 --- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.fir.kt +++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.fir.kt @@ -11,3 +11,9 @@ class A { body() } } + +context(Ctx) +fun bar(body: Ctx.() -> Unit) { + foo() + body() +} diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt index 399292654cb..1e92fd89324 100644 --- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt +++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt @@ -11,3 +11,9 @@ class A { body() } } + +context(Ctx) +fun bar(body: Ctx.() -> Unit) { + foo() + body() +} diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt new file mode 100644 index 00000000000..dd0285ca930 --- /dev/null +++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt @@ -0,0 +1,17 @@ +// FIR_IDENTICAL +// ISSUE: KT-61937 +// !LANGUAGE: +ContextReceivers + +class Ctx + +context(Ctx) +fun Ctx.foo(): String = "NOK" + +context(Ctx) +fun bar(foo: Ctx.() -> String ): String { + return foo() +} + +fun box(): String = with (Ctx()) { + bar { "OK" } +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index fdffddad2ee..d49ec3412d6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -13569,6 +13569,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContext.kt"); } + @Test + @TestMetadata("lambdaReceiverFromContextWithSameFunctions.kt") + public void testLambdaReceiverFromContextWithSameFunctions() throws Exception { + runTest("compiler/testData/diagnostics/tests/extensions/contextReceivers/lambdaReceiverFromContextWithSameFunctions.kt"); + } + @Test @TestMetadata("lazy.kt") public void testLazy() throws Exception {