diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java index bca7061729d..0fef7982304 100644 --- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java +++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java @@ -43,7 +43,7 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestG @Test public void testAllFilesPresentInReferenceShortenerWholeFile() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); } @Test @@ -57,4 +57,16 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestG public void testFileWithMultipleDeclarations() throws Exception { runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.kt"); } + + @Test + @TestMetadata("scriptFileWithImportStatement.kts") + public void testScriptFileWithImportStatement() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.kts"); + } + + @Test + @TestMetadata("scriptFileWithoutImportStatements.kts") + public void testScriptFileWithoutImportStatements() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.kts"); + } } diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java index e366277f86a..611fbef13e1 100644 --- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java +++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFileTestGenerated.java @@ -43,7 +43,7 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFi @Test public void testAllFilesPresentInReferenceShortenerWholeFile() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); } @Test @@ -57,4 +57,16 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceShortenerForWholeFi public void testFileWithMultipleDeclarations() throws Exception { runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.kt"); } + + @Test + @TestMetadata("scriptFileWithImportStatement.kts") + public void testScriptFileWithImportStatement() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.kts"); + } + + @Test + @TestMetadata("scriptFileWithoutImportStatements.kts") + public void testScriptFileWithoutImportStatements() throws Exception { + runTest("analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.kts"); + } } diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.kts b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.kts new file mode 100644 index 00000000000..605cfdf171a --- /dev/null +++ b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.kts @@ -0,0 +1,11 @@ +// FILE: main.kts +import a.b.c.dependency.Foo + +fun foo(): a.b.c.dependency.Foo = t + +// FILE: dependency.kt +package a.b.c.dependency + +class Foo { + class Nested +} diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.txt new file mode 100644 index 00000000000..2071aaddb50 --- /dev/null +++ b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithImportStatement.txt @@ -0,0 +1,7 @@ +with DO_NOT_SHORTEN: +with SHORTEN_IF_ALREADY_IMPORTED: +[type] a.b.c.dependency.Foo +with SHORTEN_AND_IMPORT: +[type] a.b.c.dependency.Foo +with SHORTEN_AND_STAR_IMPORT: +[type] a.b.c.dependency.Foo diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.kts b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.kts new file mode 100644 index 00000000000..d45ab497727 --- /dev/null +++ b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.kts @@ -0,0 +1,9 @@ +// FILE: main.kts +fun foo(): a.b.c.dependency.Foo = t + +// FILE: dependency.kt +package a.b.c.dependency + +class Foo { + class Nested +} diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.txt new file mode 100644 index 00000000000..51823200b2f --- /dev/null +++ b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/scriptFileWithoutImportStatements.txt @@ -0,0 +1,6 @@ +with DO_NOT_SHORTEN: +with SHORTEN_IF_ALREADY_IMPORTED: +with SHORTEN_AND_IMPORT: +[type] a.b.c.dependency.Foo +with SHORTEN_AND_STAR_IMPORT: +[type] a.b.c.dependency.Foo diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index b29d68ee517..c3172ab75cd 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -235,7 +235,7 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { model("referenceShortener") } test(AbstractReferenceShortenerForWholeFileTest::class) { - model("referenceShortenerWholeFile") + model("referenceShortenerWholeFile", pattern = TestGeneratorUtil.KT_OR_KTS) } }