From e924ee3150fa5cc33e290a2bbc1ec28fe93c0b1a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 3 Aug 2021 11:36:58 +0300 Subject: [PATCH] FIR: add test with minOf ambiguity --- .../intellij/DailyAggregatedDoubleFactor.fir.txt | 9 +++++++++ .../intellij/DailyAggregatedDoubleFactor.kt | 7 +++++++ .../test/runners/FirDiagnosticTestGenerated.java | 16 ++++++++++++++++ ...FirDiagnosticsWithLightTreeTestGenerated.java | 16 ++++++++++++++++ ...iagnosisCompilerFirTestdataTestGenerated.java | 16 ++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.fir.txt create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.fir.txt new file mode 100644 index 00000000000..99f43264043 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.fir.txt @@ -0,0 +1,9 @@ +FILE: DailyAggregatedDoubleFactor.kt + public abstract interface DailyAggregatedDoubleFactor : R|kotlin/Any| { + } + private final fun R|DailyAggregatedDoubleFactor|.aggregateBy(reduce: R|(kotlin/Double, kotlin/Double) -> kotlin/Double|): R|kotlin/collections/Map| { + ^aggregateBy R|kotlin/collections/mutableMapOf|() + } + public final fun R|DailyAggregatedDoubleFactor|.aggregateMin(): R|kotlin/collections/Map| { + ^aggregateMin this@R|/aggregateMin|.R|/aggregateBy|(::#) + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt new file mode 100644 index 00000000000..9e9ea000daa --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt @@ -0,0 +1,7 @@ +interface DailyAggregatedDoubleFactor + +private fun DailyAggregatedDoubleFactor.aggregateBy(reduce: (Double, Double) -> Double): Map { + return mutableMapOf() +} + +fun DailyAggregatedDoubleFactor.aggregateMin(): Map = aggregateBy(::minOf) diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java index baa12cab2d9..d423c836ddd 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java @@ -5012,6 +5012,22 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest { } } + @Nested + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij") + @TestDataPath("$PROJECT_ROOT") + public class Intellij { + @Test + public void testAllFilesPresentInIntellij() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("DailyAggregatedDoubleFactor.kt") + public void testDailyAggregatedDoubleFactor() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt"); + } + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java index f93d512c92c..1e761254792 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java @@ -5012,6 +5012,22 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos } } + @Nested + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij") + @TestDataPath("$PROJECT_ROOT") + public class Intellij { + @Test + public void testAllFilesPresentInIntellij() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("DailyAggregatedDoubleFactor.kt") + public void testDailyAggregatedDoubleFactor() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt"); + } + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k") @TestDataPath("$PROJECT_ROOT") diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java index 1288ef698fa..9ff2be79223 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java @@ -5012,6 +5012,22 @@ public class DiagnosisCompilerFirTestdataTestGenerated extends AbstractDiagnosis } } + @Nested + @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij") + @TestDataPath("$PROJECT_ROOT") + public class Intellij { + @Test + public void testAllFilesPresentInIntellij() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("DailyAggregatedDoubleFactor.kt") + public void testDailyAggregatedDoubleFactor() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt"); + } + } + @Nested @TestMetadata("compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k") @TestDataPath("$PROJECT_ROOT")