diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index 5b122355b78..4e031172f0d 100644 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -1308,6 +1308,40 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte public void testSyntheticProperty() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/java/SyntheticProperty.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("FunctionCallOnConstant.kt") + public void testFunctionCallOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt"); + } + + @Test + @TestMetadata("FunctionCallOnVariable.kt") + public void testFunctionCallOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnConstant.kt") + public void testPropertyAccessOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnVariable.kt") + public void testPropertyAccessOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt"); + } + } } @Nested diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java index 979ca23d7e7..b41b1f9ac30 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenerated.java @@ -246,6 +246,16 @@ public class FirIdeDependentAnalysisScriptSourceModuleReferenceResolveTestGenera public void testAllFilesPresentInJava() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java"), Pattern.compile("^(.+)\\.kts$"), null, true); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^(.+)\\.kts$"), null, true); + } + } } @Nested diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java index cac51e4cf2d..63f62091f98 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -1308,6 +1308,40 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex public void testSyntheticProperty() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/java/SyntheticProperty.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("FunctionCallOnConstant.kt") + public void testFunctionCallOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt"); + } + + @Test + @TestMetadata("FunctionCallOnVariable.kt") + public void testFunctionCallOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnConstant.kt") + public void testPropertyAccessOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnVariable.kt") + public void testPropertyAccessOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt"); + } + } } @Nested diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java index b55f3f9f3d9..7f4ab0de528 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java @@ -1192,6 +1192,40 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate public void testSyntheticProperty() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/java/SyntheticProperty.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors"); + } + + @Test + @TestMetadata("FunctionCallOnConstant.kt") + public void testFunctionCallOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt"); + } + + @Test + @TestMetadata("FunctionCallOnVariable.kt") + public void testFunctionCallOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnConstant.kt") + public void testPropertyAccessOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnVariable.kt") + public void testPropertyAccessOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt"); + } + } } @Nested diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java index 8cbd3239c6b..4046cfbebe1 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated.java @@ -246,6 +246,16 @@ public class FirIdeNormalAnalysisScriptSourceModuleReferenceResolveTestGenerated public void testAllFilesPresentInJava() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java"), Pattern.compile("^(.+)\\.kts$"), null, true); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^(.+)\\.kts$"), null, true); + } + } } @Nested diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index 3baea331fad..69a6c179453 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -1308,6 +1308,40 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten public void testSyntheticProperty() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/java/SyntheticProperty.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("FunctionCallOnConstant.kt") + public void testFunctionCallOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt"); + } + + @Test + @TestMetadata("FunctionCallOnVariable.kt") + public void testFunctionCallOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnConstant.kt") + public void testPropertyAccessOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnVariable.kt") + public void testPropertyAccessOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt"); + } + } } @Nested diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java index ceb244377d3..c6d7d071af5 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java @@ -1308,6 +1308,40 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate public void testSyntheticProperty() throws Exception { runTest("analysis/analysis-api/testData/referenceResolve/java/SyntheticProperty.kt"); } + + @Nested + @TestMetadata("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName") + @TestDataPath("$PROJECT_ROOT") + public class EnumWithCustomGetName { + @Test + public void testAllFilesPresentInEnumWithCustomGetName() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("FunctionCallOnConstant.kt") + public void testFunctionCallOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt"); + } + + @Test + @TestMetadata("FunctionCallOnVariable.kt") + public void testFunctionCallOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnConstant.kt") + public void testPropertyAccessOnConstant() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt"); + } + + @Test + @TestMetadata("PropertyAccessOnVariable.kt") + public void testPropertyAccessOnVariable() throws Exception { + runTest("analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt"); + } + } } @Nested diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.descriptors.txt new file mode 100644 index 00000000000..0143f8d6371 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.descriptors.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in JavaEnum) fun getName(): kotlin.String! diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt new file mode 100644 index 00000000000..76c43106de1 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.kt @@ -0,0 +1,13 @@ +// FILE: JavaEnum.java +public enum JavaEnum { + A, B, C; + + public String getName() { + return "FromJava"; + } +} + +// FILE: Usage.kt +fun foo() { + JavaEnum.A.getName() +} diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.txt new file mode 100644 index 00000000000..db2f5e178c1 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnConstant.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in JavaEnum) open fun getName(): kotlin.String! diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.descriptors.txt new file mode 100644 index 00000000000..0143f8d6371 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.descriptors.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in JavaEnum) fun getName(): kotlin.String! diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt new file mode 100644 index 00000000000..7e5e3a4d950 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.kt @@ -0,0 +1,13 @@ +// FILE: JavaEnum.java +public enum JavaEnum { + A, B, C; + + public String getName() { + return "FromJava"; + } +} + +// FILE: Usage.kt +fun foo(enum: JavaEnum) { + enum.getName() +} diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.txt new file mode 100644 index 00000000000..db2f5e178c1 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/FunctionCallOnVariable.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in JavaEnum) open fun getName(): kotlin.String! diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt new file mode 100644 index 00000000000..fdfcf1f0ad8 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.kt @@ -0,0 +1,13 @@ +// FILE: JavaEnum.java +public enum JavaEnum { + A, B, C; + + public String getName() { + return "FromJava"; + } +} + +// FILE: Usage.kt +fun foo() { + JavaEnum.A.name +} diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.txt new file mode 100644 index 00000000000..a5bb7840ea0 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnConstant.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in kotlin.Enum) val name: kotlin.String diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt new file mode 100644 index 00000000000..72a33578567 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.kt @@ -0,0 +1,13 @@ +// FILE: JavaEnum.java +public enum JavaEnum { + A, B, C; + + public String getName() { + return "FromJava"; + } +} + +// FILE: Usage.kt +fun foo(enum: JavaEnum) { + enum.name +} diff --git a/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.txt b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.txt new file mode 100644 index 00000000000..a5bb7840ea0 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/java/enumWithCustomGetName/PropertyAccessOnVariable.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in kotlin.Enum) val name: kotlin.String