From 6ae648f6f6aa65026186fc2a8f8dcad03ebe72e4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 3 May 2023 09:50:25 +0200 Subject: [PATCH] K2: reproduce KT-58379 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 +++++ ...sticCompilerFE10TestDataTestGenerated.java | 6 +++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 +++++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 +++++ .../tests/integerLiterals/sortedBy.fir.kt | 25 +++++++++++++++++++ .../tests/integerLiterals/sortedBy.kt | 25 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 +++++ 7 files changed, 80 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/integerLiterals/sortedBy.fir.kt create mode 100644 compiler/testData/diagnostics/tests/integerLiterals/sortedBy.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 eef0b3aa019..a7891b1e3f8 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 @@ -19320,6 +19320,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/integerLiterals/literalsInInference.kt"); } + @Test + @TestMetadata("sortedBy.kt") + public void testSortedBy() throws Exception { + runTest("compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt"); + } + @Test @TestMetadata("typealiasOnLong.kt") public void testTypealiasOnLong() 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 04a36c218f3..731ead4a0a0 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 @@ -19320,6 +19320,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/integerLiterals/literalsInInference.kt"); } + @Test + @TestMetadata("sortedBy.kt") + public void testSortedBy() throws Exception { + runTest("compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt"); + } + @Test @TestMetadata("typealiasOnLong.kt") public void testTypealiasOnLong() 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 630da5e58f8..b743e5194a0 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 @@ -19320,6 +19320,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/integerLiterals/literalsInInference.kt"); } + @Test + @TestMetadata("sortedBy.kt") + public void testSortedBy() throws Exception { + runTest("compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt"); + } + @Test @TestMetadata("typealiasOnLong.kt") public void testTypealiasOnLong() 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 9dd028cad70..773203a90b8 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 @@ -19326,6 +19326,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/integerLiterals/literalsInInference.kt"); } + @Test + @TestMetadata("sortedBy.kt") + public void testSortedBy() throws Exception { + runTest("compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt"); + } + @Test @TestMetadata("typealiasOnLong.kt") public void testTypealiasOnLong() throws Exception { diff --git a/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.fir.kt b/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.fir.kt new file mode 100644 index 00000000000..2acb420d209 --- /dev/null +++ b/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.fir.kt @@ -0,0 +1,25 @@ +// WITH_STDLIB + +import Cause.* + +typealias ChallengeFunction = suspend (String) -> Unit + +enum class Cause { + FIRST, + SECOND, + ERROR, + LAST +} + +class Some { + internal val register = mutableListOf>() + + internal val challenges: List + get() = register.filter { it.first != ERROR }.sortedBy { + when (it.first) { + FIRST -> 1 + SECOND -> 2 + else -> throw AssertionError() + } + }.map { it.second } +} diff --git a/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt b/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt new file mode 100644 index 00000000000..ffe81162456 --- /dev/null +++ b/compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt @@ -0,0 +1,25 @@ +// WITH_STDLIB + +import Cause.* + +typealias ChallengeFunction = suspend (String) -> Unit + +enum class Cause { + FIRST, + SECOND, + ERROR, + LAST +} + +class Some { + internal val register = mutableListOf>() + + internal val challenges: List + get() = register.filter { it.first != ERROR }.sortedBy { + when (it.first) { + FIRST -> 1 + SECOND -> 2 + else -> throw AssertionError() + } + }.map { it.second } +} 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 f07c1b7b892..9406282acea 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 @@ -19326,6 +19326,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/integerLiterals/literalsInInference.kt"); } + @Test + @TestMetadata("sortedBy.kt") + public void testSortedBy() throws Exception { + runTest("compiler/testData/diagnostics/tests/integerLiterals/sortedBy.kt"); + } + @Test @TestMetadata("typealiasOnLong.kt") public void testTypealiasOnLong() throws Exception {