From 8cbefcc26fdf727b3d4ac78c02c6275c1510affc Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 21 Aug 2023 16:15:35 +0200 Subject: [PATCH] K2: add test to ensure #KT-55981 Obsolete --- ...cCompilerTestFirTestdataTestGenerated.java | 6 ++++++ ...osticCompilerFirTestDataTestGenerated.java | 6 ++++++ .../problems/malformedRawTypes.fir.txt | 8 ++++++++ .../problems/malformedRawTypes.kt | 19 +++++++++++++++++++ .../FirLightTreeDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiDiagnosticTestGenerated.java | 6 ++++++ 6 files changed, 51 insertions(+) create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.fir.txt create mode 100644 compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java index f7f0865e415..a1f98cbd6ed 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java @@ -6903,6 +6903,12 @@ public class DiagnosticCompilerTestFirTestdataTestGenerated extends AbstractDiag runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/localScopesInAnonymousObject.kt"); } + @Test + @TestMetadata("malformedRawTypes.kt") + public void testMalformedRawTypes() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt"); + } + @Test @TestMetadata("NamedParameterInConcurrentMap.kt") public void testNamedParameterInConcurrentMap() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java index 4ba422623bd..b9cbb3ec23e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java @@ -6903,6 +6903,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/localScopesInAnonymousObject.kt"); } + @Test + @TestMetadata("malformedRawTypes.kt") + public void testMalformedRawTypes() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt"); + } + @Test @TestMetadata("NamedParameterInConcurrentMap.kt") public void testNamedParameterInConcurrentMap() throws Exception { diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.fir.txt new file mode 100644 index 00000000000..b2126ae3e11 --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.fir.txt @@ -0,0 +1,8 @@ +FILE: Main.kt + public final fun main(): R|kotlin/Unit| { + lvar generic: R|ft, Generic<*>?>| = Q|Generic|.R|/Generic.raw*s| + lvar inner1: R|ft, Generic.Inner<*>?>| = R|/generic|.R|SubstitutionOverride| + R|/inner1| = R|/Generic.Generic|().R|SubstitutionOverride|() + lvar inner2: R|ft, Generic.Inner<*>?>| = R|/generic|.R|SubstitutionOverride| + R|/inner2| = R|/Generic.Generic|().R|SubstitutionOverride|() + } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt new file mode 100644 index 00000000000..c65ada632fb --- /dev/null +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt @@ -0,0 +1,19 @@ +// FILE: Generic.java + +public class Generic { + public class Inner {} + public static Generic raw = new Generic<>(); + public Inner inner = new Inner(); + public Generic.Inner rawInner = new Inner(); +} + +// FILE: Main.kt +fun main() { + var generic = Generic.raw + + var inner1 = generic.inner + inner1 = Generic().Inner() + + var inner2 = generic.rawInner + inner2 = Generic().Inner() +} diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java index c0d2081271b..e266026b964 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java @@ -6903,6 +6903,12 @@ public class FirLightTreeDiagnosticsTestGenerated extends AbstractFirLightTreeDi runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/localScopesInAnonymousObject.kt"); } + @Test + @TestMetadata("malformedRawTypes.kt") + public void testMalformedRawTypes() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt"); + } + @Test @TestMetadata("NamedParameterInConcurrentMap.kt") public void testNamedParameterInConcurrentMap() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java index f0e96dd318b..dc1a257dea6 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java @@ -6903,6 +6903,12 @@ public class FirPsiDiagnosticTestGenerated extends AbstractFirPsiDiagnosticTest runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/localScopesInAnonymousObject.kt"); } + @Test + @TestMetadata("malformedRawTypes.kt") + public void testMalformedRawTypes() throws Exception { + runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/malformedRawTypes.kt"); + } + @Test @TestMetadata("NamedParameterInConcurrentMap.kt") public void testNamedParameterInConcurrentMap() throws Exception {