From 65972fa64ce10b659480d1a6fb8c3470205d5c62 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Fri, 28 May 2021 17:38:37 +0200 Subject: [PATCH] 'idea-frontend-fir' move fir tests into subpackage 'org.jetbrains.kotlin.idea.fir' In intellij infrastructure we run tests by matching package pattern. So in order to be able run FIR tests we need to place them into unique package --- .../kotlin/generators/tests/idea/GenerateTests.kt | 15 ++++++++------- .../classes/FirClassLoadingTestGenerated.java | 1 - .../classes/FirLightClassTestGenerated.java | 1 - .../classes/FirLightFacadeClassTestGenerated.java | 1 - .../AbstractFirKotlinHighlightingPassTest.kt | 4 ++-- .../FirKotlinHighlightingPassTestGenerated.java | 1 - .../codeinsight/FirJava8OverrideImplementTest.kt | 2 +- .../fir/codeinsight/FirOverrideImplementTest.kt | 2 +- .../codeinsight/FirOverrideImplementTestMixIn.kt | 2 +- .../FirOverrideImplementWithLibTest.kt | 2 +- .../FirKeywordCompletionTestGenerated.java | 1 - .../HighLevelJvmBasicCompletionTestGenerated.java | 1 - ...lMultiFileJvmBasicCompletionTestGenerated.java | 1 - .../FirKeywordCompletionHandlerTestGenerated.java | 1 - ...hLevelBasicCompletionHandlerTestGenerated.java | 1 - .../wheigher/HighLevelWeigherTestGenerated.java | 1 - .../fir/findUsages/AbstractFindUsagesFirTest.kt | 2 +- ...FindUsagesWithDisableComponentSearchFirTest.kt | 2 +- .../AbstractKotlinFindUsagesWithLibraryTest.kt | 2 +- .../AbstractKotlinFindUsagesWithStdlibTest.kt | 2 +- .../findUsages/FindUsagesFirTestGenerated.java | 1 - ...ithDisableComponentSearchFirTestGenerated.java | 1 - ...tlinFindUsagesWithLibraryFirTestGenerated.java | 1 - ...otlinFindUsagesWithStdlibFirTestGenerated.java | 1 - .../highlighter/AbstractFirHighlightingTest.kt | 6 +++--- .../highlighter/FirHighlightingTestGenerated.java | 1 - .../inspections/HLInspectionTestGenerated.java | 1 - .../HLLocalInspectionTestGenerated.java | 1 - .../fir/intentions/HLIntentionTestGenerated.java | 1 - .../HighLevelQuickFixMultiFileTestGenerated.java | 1 - .../quickfix/HighLevelQuickFixTestGenerated.java | 1 - .../resolve/AbstractFirReferenceResolveTest.kt | 2 +- .../resolve/FirReferenceResolveTestGenerated.java | 1 - .../shortenRefs/FirShortenRefsTestGenerated.java | 1 - .../frontend/api/AbstractSymbolByFqNameTest.kt | 6 ++++-- .../api/KtAnalysisSessionContractsTest.kt | 5 ++++- .../idea/{ => fir}/frontend/api/SymbolByFqName.kt | 3 ++- .../AbstractExpectedExpressionTypeTest.kt | 4 ++-- .../components/AbstractHLExpressionTypeTest.kt | 12 ++++++------ .../AbstractOverriddenDeclarationProviderTest.kt | 13 +++++++------ .../api/components/AbstractRendererTest.kt | 6 ++++-- .../AbstractReturnExpressionTargetTest.kt | 4 ++-- .../ExpectedExpressionTypeTestGenerated.java | 2 +- .../components/HLExpressionTypeTestGenerated.java | 2 +- ...verriddenDeclarationProviderTestGenerated.java | 2 +- .../api/components/RendererTestGenerated.java | 2 +- .../ReturnExpressionTargetTestGenerated.java | 2 +- .../frontend/api/fir/AbstractResolveCallTest.kt | 6 +++--- .../api/fir/ResolveCallTestGenerated.java | 2 +- .../frontend/api/scopes/AbstractFileScopeTest.kt | 4 ++-- .../api/scopes/AbstractMemberScopeTest.kt | 8 ++++---- .../api/scopes/FileScopeTestGenerated.java | 2 +- .../scopes/MemberScopeByFqNameTestGenerated.java | 2 +- .../symbols/AbstractMemoryLeakInSymbolsTest.kt | 5 +++-- .../api/symbols/AbstractSymbolByFqNameTest.kt | 7 ++++--- .../api/symbols/AbstractSymbolByPsiTest.kt | 5 +++-- .../api/symbols/AbstractSymbolByReferenceTest.kt | 5 +++-- .../frontend/api/symbols/AbstractSymbolTest.kt | 8 +++++--- .../symbols/MemoryLeakInSymbolsTestGenerated.java | 2 +- .../api/symbols/SymbolByFqNameTestGenerated.java | 2 +- .../api/symbols/SymbolByPsiTestGenerated.java | 2 +- .../symbols/SymbolByReferenceTestGenerated.java | 2 +- .../frontend/api/types/KtTypeRendererTest.kt | 6 +++--- .../test/framework/AbstractKtIdeaTest.kt | 4 +++- .../idea/{ => fir}/test/framework/KtTest.kt | 2 +- .../test/framework/SelectedExpressionProvider.kt | 2 +- .../{ => fir}/test/framework/TestFileDirective.kt | 2 +- .../{ => fir}/test/framework/TestFileStructure.kt | 4 +++- .../test/framework/TestStructureRenderer.kt | 7 ++++++- .../jetbrains/kotlin/idea/{ => fir}/testUtils.kt | 2 +- 70 files changed, 111 insertions(+), 108 deletions(-) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/AbstractSymbolByFqNameTest.kt (87%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/KtAnalysisSessionContractsTest.kt (90%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/SymbolByFqName.kt (97%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/AbstractExpectedExpressionTypeTest.kt (93%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/AbstractHLExpressionTypeTest.kt (73%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt (85%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/AbstractRendererTest.kt (82%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/AbstractReturnExpressionTargetTest.kt (95%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/ExpectedExpressionTypeTestGenerated.java (99%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/HLExpressionTypeTestGenerated.java (98%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java (97%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/RendererTestGenerated.java (99%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/components/ReturnExpressionTargetTestGenerated.java (97%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/fir/AbstractResolveCallTest.kt (96%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/fir/ResolveCallTestGenerated.java (98%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/scopes/AbstractFileScopeTest.kt (93%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/scopes/AbstractMemberScopeTest.kt (77%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/scopes/FileScopeTestGenerated.java (96%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java (97%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt (95%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/AbstractSymbolByFqNameTest.kt (69%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/AbstractSymbolByPsiTest.kt (78%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/AbstractSymbolByReferenceTest.kt (79%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/AbstractSymbolTest.kt (93%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java (96%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/SymbolByFqNameTestGenerated.java (98%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/SymbolByPsiTestGenerated.java (98%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/symbols/SymbolByReferenceTestGenerated.java (96%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/frontend/api/types/KtTypeRendererTest.kt (96%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/AbstractKtIdeaTest.kt (95%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/KtTest.kt (86%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/SelectedExpressionProvider.kt (97%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/TestFileDirective.kt (90%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/TestFileStructure.kt (90%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/test/framework/TestStructureRenderer.kt (90%) rename idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/{ => fir}/testUtils.kt (99%) diff --git a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt index b318db2103b..5b11dca03eb 100644 --- a/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt +++ b/generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt @@ -80,6 +80,7 @@ import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest +import org.jetbrains.kotlin.idea.fir.frontend.api.components.* import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingTest import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest @@ -98,13 +99,13 @@ import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest import org.jetbrains.kotlin.idea.frontend.api.components.* -import org.jetbrains.kotlin.idea.frontend.api.fir.AbstractResolveCallTest -import org.jetbrains.kotlin.idea.frontend.api.scopes.AbstractFileScopeTest -import org.jetbrains.kotlin.idea.frontend.api.scopes.AbstractMemberScopeByFqNameTest -import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractMemoryLeakInSymbolsTest -import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByFqNameTest -import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByPsiTest -import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByReferenceTest +import org.jetbrains.kotlin.idea.fir.frontend.api.fir.AbstractResolveCallTest +import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractFileScopeTest +import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractMemberScopeByFqNameTest +import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractMemoryLeakInSymbolsTest +import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByFqNameTest +import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByPsiTest +import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByReferenceTest import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest import org.jetbrains.kotlin.idea.highlighter.* diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java index dac51fbc72d..4298feddb98 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.asJava.classes; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirClassLoadingTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java index 34111b0db11..38ee339ba31 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.asJava.classes; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightClassTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java index f740adef1f1..706c1e572ee 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.asJava.classes; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightFacadeClassTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt index 28bdf267f5b..695060b261e 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/AbstractFirKotlinHighlightingPassTest.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.idea.fir.checkers import com.intellij.rt.execution.junit.FileComparisonFailure import org.jetbrains.kotlin.checkers.AbstractKotlinHighlightingPassTest import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions -import org.jetbrains.kotlin.idea.withPossiblyDisabledDuplicatedFirSourceElementsException +import org.jetbrains.kotlin.idea.fir.withPossiblyDisabledDuplicatedFirSourceElementsException import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java index 8b3ad686b67..9563802e210 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/checkers/FirKotlinHighlightingPassTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.checkers.AbstractFirKotlinHighlightingPassTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt index ceadbd1885f..16b9a49ba3d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirJava8OverrideImplementTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.Java8OverrideImplementTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.runner.RunWith diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt index fb89a0dc611..64043c548f2 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.runner.RunWith diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt index 40be9c108b5..c85deafcd10 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementTestMixIn.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt index d83ae85d7ba..83ca5dae338 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/codeinsight/FirOverrideImplementWithLibTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.codeinsight import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementWithLibTest import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.junit.runner.RunWith diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java index ac87f6a3ae7..1de88e5a32d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.AbstractFirKeywordCompletionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java index b784990a0e0..059ac7be1e0 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelJvmBasicCompletionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java index 8060d98d41b..1831d3305b9 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java index 34e580e36ba..a350f635bcc 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion.test.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractFirKeywordCompletionHandlerTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java index 1813ad21b28..5e61b222d7d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion.test.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractHighLevelBasicCompletionHandlerTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java index fcea687810c..5cf10891eea 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.completion.wheigher; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.completion.wheigher.AbstractHighLevelWeigherTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt index d33b529d5c9..0c0efa65cfb 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesFirTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages import com.intellij.psi.PsiElement import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile abstract class AbstractFindUsagesFirTest : AbstractFindUsagesTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt index aea8a8f14a1..6bb8328186b 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractFindUsagesWithDisableComponentSearchFirTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages import com.intellij.psi.PsiElement import org.jetbrains.kotlin.findUsages.AbstractFindUsagesWithDisableComponentSearchTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile abstract class AbstractFindUsagesWithDisableComponentSearchFirTest : AbstractFindUsagesWithDisableComponentSearchTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt index 07a14ba8018..7bd15e23cf3 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages import com.intellij.psi.PsiElement import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile abstract class AbstractKotlinFindUsagesWithLibraryFirTest : AbstractKotlinFindUsagesWithLibraryTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt index ba88f194274..3ca839bbc57 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/AbstractKotlinFindUsagesWithStdlibTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.fir.findUsages import com.intellij.psi.PsiElement import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithStdlibTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.psi.KtFile abstract class AbstractKotlinFindUsagesWithStdlibFirTest : AbstractKotlinFindUsagesWithStdlibTest() { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java index b71154e3760..cf1d604f09e 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java index 06525719dcb..378431b6eac 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java index e4e31abc7ae..911b11e0642 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java index d2d54ba747d..36f7d8b11f5 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt index 7ab4cce8f89..4db9053049c 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/AbstractFirHighlightingTest.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.idea.fir.highlighter -import org.jetbrains.kotlin.idea.addExternalTestFiles +import org.jetbrains.kotlin.idea.fir.addExternalTestFiles import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources -import org.jetbrains.kotlin.idea.withPossiblyDisabledDuplicatedFirSourceElementsException +import org.jetbrains.kotlin.idea.fir.withPossiblyDisabledDuplicatedFirSourceElementsException import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.utils.IgnoreTests diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java index 43803222abc..92b8a9797ad 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java index 8225ef1f13f..23f78dcc5ac 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.inspections; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java index a01ea45da09..98bc9ecb49c 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.inspections; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java index 23464471561..f012123fdeb 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.intentions; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.intentions.AbstractHLIntentionTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java index 4b8cb36df3a..d045f00fea2 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixMultiFileTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java index 784d3af43c6..8588c638fe6 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt index 1aa63e007cb..56b0d00720a 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/AbstractFirReferenceResolveTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.fir.resolve import org.jetbrains.kotlin.idea.completion.test.configureWithExtraFile -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java index a279d319410..fbe82c50473 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java index ee8153640c8..bceb55ddaeb 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.fir.shortenRefs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/AbstractSymbolByFqNameTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/AbstractSymbolByFqNameTest.kt similarity index 87% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/AbstractSymbolByFqNameTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/AbstractSymbolByFqNameTest.kt index 0a65c72b6bb..2c75cd40c21 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/AbstractSymbolByFqNameTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/AbstractSymbolByFqNameTest.kt @@ -3,9 +3,11 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api +package org.jetbrains.kotlin.idea.fir.frontend.api -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession +import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionContractsTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/KtAnalysisSessionContractsTest.kt similarity index 90% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionContractsTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/KtAnalysisSessionContractsTest.kt index d280a51633d..d0d61087ca6 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/KtAnalysisSessionContractsTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/KtAnalysisSessionContractsTest.kt @@ -3,11 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api +package org.jetbrains.kotlin.idea.fir.frontend.api import com.intellij.openapi.application.ApplicationManager import com.intellij.testFramework.LightProjectDescriptor import junit.framework.Assert +import org.jetbrains.kotlin.idea.frontend.api.WriteActionStartInsideAnalysisContextException +import org.jetbrains.kotlin.idea.frontend.api.analyse +import org.jetbrains.kotlin.idea.frontend.api.analyseWithCustomToken import org.jetbrains.kotlin.idea.frontend.api.tokens.AlwaysAccessibleValidityTokenFactory import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/SymbolByFqName.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/SymbolByFqName.kt similarity index 97% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/SymbolByFqName.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/SymbolByFqName.kt index 2ec6f57a2b7..a1940a98129 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/SymbolByFqName.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/SymbolByFqName.kt @@ -3,9 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api +package org.jetbrains.kotlin.idea.fir.frontend.api import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractExpectedExpressionTypeTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractExpectedExpressionTypeTest.kt similarity index 93% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractExpectedExpressionTypeTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractExpectedExpressionTypeTest.kt index 9f93557bbb0..8dc6dabf9b7 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractExpectedExpressionTypeTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractExpectedExpressionTypeTest.kt @@ -3,11 +3,11 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components +package org.jetbrains.kotlin.idea.fir.frontend.api.components import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.util.parentOfType -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtExpression diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractHLExpressionTypeTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractHLExpressionTypeTest.kt similarity index 73% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractHLExpressionTypeTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractHLExpressionTypeTest.kt index c091ddf642b..c0fa17c554f 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractHLExpressionTypeTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractHLExpressionTypeTest.kt @@ -3,14 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components +package org.jetbrains.kotlin.idea.fir.frontend.api.components -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse -import org.jetbrains.kotlin.idea.test.framework.AbstractKtIdeaTest -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure -import org.jetbrains.kotlin.idea.test.framework.TestStructureExpectedDataBlock -import org.jetbrains.kotlin.idea.test.framework.TestStructureRenderer +import org.jetbrains.kotlin.idea.fir.test.framework.AbstractKtIdeaTest +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock +import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureRenderer import org.jetbrains.kotlin.idea.util.application.executeOnPooledThread import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt similarity index 85% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt index 0b5268241a0..5792d6d822c 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt @@ -3,20 +3,21 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components +package org.jetbrains.kotlin.idea.fir.frontend.api.components import com.intellij.psi.util.parentOfType import com.intellij.psi.util.parentsOfType -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSyntheticJavaPropertySymbol -import org.jetbrains.kotlin.idea.test.framework.AbstractKtIdeaTest -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure -import org.jetbrains.kotlin.idea.test.framework.TestStructureExpectedDataBlock -import org.jetbrains.kotlin.idea.test.framework.TestStructureRenderer +import org.jetbrains.kotlin.idea.fir.test.framework.AbstractKtIdeaTest +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock +import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureRenderer +import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractRendererTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractRendererTest.kt similarity index 82% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractRendererTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractRendererTest.kt index 741ccec94b3..2307e9cd363 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractRendererTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractRendererTest.kt @@ -3,11 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components +package org.jetbrains.kotlin.idea.fir.frontend.api.components import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse +import org.jetbrains.kotlin.idea.frontend.api.components.KtDeclarationRendererOptions +import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractReturnExpressionTargetTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractReturnExpressionTargetTest.kt similarity index 95% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractReturnExpressionTargetTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractReturnExpressionTargetTest.kt index 4765983201c..ba46a534761 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractReturnExpressionTargetTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/AbstractReturnExpressionTargetTest.kt @@ -3,13 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components +package org.jetbrains.kotlin.idea.fir.frontend.api.components import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiComment import com.intellij.psi.util.parentOfType import junit.framework.Assert -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtDeclaration diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ExpectedExpressionTypeTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ExpectedExpressionTypeTestGenerated.java similarity index 99% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ExpectedExpressionTypeTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ExpectedExpressionTypeTestGenerated.java index bca7de75118..398d366ea20 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ExpectedExpressionTypeTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ExpectedExpressionTypeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components; +package org.jetbrains.kotlin.idea.fir.frontend.api.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/HLExpressionTypeTestGenerated.java similarity index 98% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/HLExpressionTypeTestGenerated.java index 990e3f686bc..cb48558e2dc 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/HLExpressionTypeTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/HLExpressionTypeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components; +package org.jetbrains.kotlin.idea.fir.frontend.api.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java similarity index 97% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java index 9179c117b7f..9baff0fdd20 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/OverriddenDeclarationProviderTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components; +package org.jetbrains.kotlin.idea.fir.frontend.api.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/RendererTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/RendererTestGenerated.java similarity index 99% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/RendererTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/RendererTestGenerated.java index 94c886c708a..97482fa1870 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/RendererTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/RendererTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components; +package org.jetbrains.kotlin.idea.fir.frontend.api.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ReturnExpressionTargetTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ReturnExpressionTargetTestGenerated.java similarity index 97% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ReturnExpressionTargetTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ReturnExpressionTargetTestGenerated.java index 5c31f919735..78f9ac52451 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/ReturnExpressionTargetTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/components/ReturnExpressionTargetTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.components; +package org.jetbrains.kotlin.idea.fir.frontend.api.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/AbstractResolveCallTest.kt similarity index 96% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/AbstractResolveCallTest.kt index 7720fd2b940..35c8cfe9802 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/AbstractResolveCallTest.kt @@ -3,14 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.fir +package org.jetbrains.kotlin.idea.fir.frontend.api.fir import com.intellij.openapi.editor.CaretState import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.testFramework.LightCodeInsightTestCase -import org.jetbrains.kotlin.idea.addExternalTestFiles -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.addExternalTestFiles +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.calls.KtCall diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/ResolveCallTestGenerated.java similarity index 98% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/ResolveCallTestGenerated.java index d61359f9fbe..6f89ba16777 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/fir/ResolveCallTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.fir; +package org.jetbrains.kotlin.idea.fir.frontend.api.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractFileScopeTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt similarity index 93% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractFileScopeTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt index 93f11786fb9..d68a9b4c56c 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractFileScopeTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractFileScopeTest.kt @@ -3,10 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.scopes +package org.jetbrains.kotlin.idea.fir.frontend.api.scopes import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractMemberScopeTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractMemberScopeTest.kt similarity index 77% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractMemberScopeTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractMemberScopeTest.kt index 45e978c2ef5..26fed2d8d1e 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/AbstractMemberScopeTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/AbstractMemberScopeTest.kt @@ -3,14 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.scopes +package org.jetbrains.kotlin.idea.fir.frontend.api.scopes import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.SymbolByFqName -import org.jetbrains.kotlin.idea.frontend.api.symbols.AbstractSymbolByFqNameTest +import org.jetbrains.kotlin.idea.fir.frontend.api.SymbolByFqName +import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure abstract class AbstractMemberScopeByFqNameTest : AbstractSymbolByFqNameTest() { override fun KtAnalysisSession.collectSymbols(fileStructure: TestFileStructure): List { diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/FileScopeTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/FileScopeTestGenerated.java similarity index 96% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/FileScopeTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/FileScopeTestGenerated.java index ac38a0465a9..203e76552d8 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/FileScopeTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/FileScopeTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.scopes; +package org.jetbrains.kotlin.idea.fir.frontend.api.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java similarity index 97% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java index 786a473b7fe..3a61563923b 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/scopes/MemberScopeByFqNameTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.scopes; +package org.jetbrains.kotlin.idea.fir.frontend.api.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt similarity index 95% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt index 240bc186f5b..57946c17eff 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt @@ -3,20 +3,21 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols import com.intellij.openapi.components.service import com.intellij.openapi.util.io.FileUtil import com.sun.management.HotSpotDiagnosticMXBean import junit.framework.Assert import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSessionProvider import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByFqNameTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByFqNameTest.kt similarity index 69% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByFqNameTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByFqNameTest.kt index d98ffa1968a..4dde7c35018 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByFqNameTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByFqNameTest.kt @@ -3,11 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.frontend.api.SymbolByFqName -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.frontend.api.SymbolByFqName +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol abstract class AbstractSymbolByFqNameTest : AbstractSymbolTest() { override fun KtAnalysisSession.collectSymbols(fileStructure: TestFileStructure): List { diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByPsiTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByPsiTest.kt similarity index 78% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByPsiTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByPsiTest.kt index 0dac23fe501..b22b6cf7608 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByPsiTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByPsiTest.kt @@ -3,10 +3,11 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByReferenceTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByReferenceTest.kt similarity index 79% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByReferenceTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByReferenceTest.kt index 1ad646ddbde..6d541c9d496 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolByReferenceTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolByReferenceTest.kt @@ -3,11 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.references.mainReference -import org.jetbrains.kotlin.idea.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtNameReferenceExpression abstract class AbstractSymbolByReferenceTest : AbstractSymbolTest() { diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt similarity index 93% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt index 72a1cdeefe3..173310ccf2f 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractSymbolTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/AbstractSymbolTest.kt @@ -3,16 +3,18 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.editor.Document import com.intellij.psi.PsiDocumentManager -import org.jetbrains.kotlin.idea.analyseOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.analyseOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.test.framework.* import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession +import org.jetbrains.kotlin.idea.frontend.api.symbols.DebugSymbolRenderer +import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer -import org.jetbrains.kotlin.idea.test.framework.* import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java similarity index 96% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java index 43b37e11df0..5f901eeab11 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/MemoryLeakInSymbolsTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols; +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByFqNameTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByFqNameTestGenerated.java similarity index 98% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByFqNameTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByFqNameTestGenerated.java index 95bd3b7a94b..10768d08709 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByFqNameTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByFqNameTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols; +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByPsiTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java similarity index 98% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByPsiTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java index f2782d113fa..88c789f3b55 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByPsiTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByPsiTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols; +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByReferenceTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByReferenceTestGenerated.java similarity index 96% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByReferenceTestGenerated.java rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByReferenceTestGenerated.java index ba63423804f..5f08df4f3b1 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/SymbolByReferenceTestGenerated.java +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/symbols/SymbolByReferenceTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.symbols; +package org.jetbrains.kotlin.idea.fir.frontend.api.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/types/KtTypeRendererTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/types/KtTypeRendererTest.kt similarity index 96% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/types/KtTypeRendererTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/types/KtTypeRendererTest.kt index dac41f981db..a346927ace9 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/types/KtTypeRendererTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/frontend/api/types/KtTypeRendererTest.kt @@ -3,13 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.types +package org.jetbrains.kotlin.idea.fir.frontend.api.types import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction +import org.jetbrains.kotlin.idea.fir.executeOnPooledThreadInReadAction import org.jetbrains.kotlin.idea.frontend.api.analyse import org.jetbrains.kotlin.idea.frontend.api.components.KtTypeRendererOptions -import org.jetbrains.kotlin.idea.invalidateCaches +import org.jetbrains.kotlin.idea.fir.invalidateCaches import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/AbstractKtIdeaTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/AbstractKtIdeaTest.kt similarity index 95% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/AbstractKtIdeaTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/AbstractKtIdeaTest.kt index 01e756127c2..36d392b35ff 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/AbstractKtIdeaTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/AbstractKtIdeaTest.kt @@ -3,12 +3,14 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiElement import com.intellij.psi.util.parentOfType +import org.jetbrains.kotlin.idea.fir.test.framework.SelectedExpressionProvider import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.fir.test.framework.* import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import java.io.File diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/KtTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/KtTest.kt similarity index 86% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/KtTest.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/KtTest.kt index 353f4866d45..024d6a71146 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/KtTest.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/KtTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework object KtTest { const val CARET_SYMBOL = "" diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/SelectedExpressionProvider.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/SelectedExpressionProvider.kt similarity index 97% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/SelectedExpressionProvider.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/SelectedExpressionProvider.kt index cfc4337f52a..fcfa3762e05 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/SelectedExpressionProvider.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/SelectedExpressionProvider.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.psi.KtElement diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileDirective.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileDirective.kt similarity index 90% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileDirective.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileDirective.kt index c7db704c623..0a93c0bc945 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileDirective.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileDirective.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework import java.util.* diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileStructure.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileStructure.kt similarity index 90% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileStructure.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileStructure.kt index 29cb5f149ff..107dc04ca21 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestFileStructure.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestFileStructure.kt @@ -3,10 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework import com.intellij.psi.PsiFile import com.intellij.psi.PsiJavaFile +import org.jetbrains.kotlin.idea.fir.test.framework.PresenceDirective +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileDirective import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import java.nio.file.Path diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestStructureRenderer.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestStructureRenderer.kt similarity index 90% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestStructureRenderer.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestStructureRenderer.kt index 7288556bd14..babe6f1f3bf 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/test/framework/TestStructureRenderer.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/test/framework/TestStructureRenderer.kt @@ -3,8 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.test.framework +package org.jetbrains.kotlin.idea.fir.test.framework +import org.jetbrains.kotlin.idea.fir.test.framework.SelectedExpressionProvider +import org.jetbrains.kotlin.idea.fir.test.framework.KtTest +import org.jetbrains.kotlin.idea.fir.test.framework.TestFile +import org.jetbrains.kotlin.idea.fir.test.framework.TestFileStructure +import org.jetbrains.kotlin.idea.fir.test.framework.TestStructureExpectedDataBlock import org.jetbrains.kotlin.psi.psiUtil.getStartOffsetIn object TestStructureRenderer { diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/testUtils.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/testUtils.kt similarity index 99% rename from idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/testUtils.kt rename to idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/testUtils.kt index 6f3777d5af6..8e6511eb70b 100644 --- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/testUtils.kt +++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/fir/testUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea +package org.jetbrains.kotlin.idea.fir import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.runReadAction