diff --git a/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt b/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt index 023cb702907..bdf8931a81e 100644 --- a/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt +++ b/analysis/analysis-api/testData/components/overridenDeclarations/onEnumEntry.kt @@ -1,3 +1,4 @@ +// DISABLE_DEPENDED_MODE enum class MyEnum { MyEntry } \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/InEnumEntry.kt b/analysis/analysis-api/testData/referenceResolve/InEnumEntry.kt index 633a975bf1a..cd2fb6b970e 100644 --- a/analysis/analysis-api/testData/referenceResolve/InEnumEntry.kt +++ b/analysis/analysis-api/testData/referenceResolve/InEnumEntry.kt @@ -1,3 +1,4 @@ +// DISABLE_DEPENDED_MODE package test val TOP_LEVEL = 5 diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt index f28a1066197..a2d4e48e12f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiTest.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.TestInfrastructureInternals import org.jetbrains.kotlin.test.bind import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder @@ -113,8 +114,9 @@ abstract class AbstractLowLevelApiTest : TestWithDisposable() { val ktFiles = moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList() doTestByFileStructure(ktFiles, moduleStructure, testServices) - useDependedAnalysisSession = true + if (ktFiles.any { InTextDirectivesUtils.isDirectiveDefined(it.text, DISABLE_DEPENDED_MODE_DIRECTIVE) }) return try { + useDependedAnalysisSession = true doTestByFileStructure(ktFiles.map { val fakeFile = it.copy() as KtFile fakeFile.originalKtFile = it @@ -178,5 +180,9 @@ abstract class AbstractLowLevelApiTest : TestWithDisposable() { } private class SkipDependedModeException : Exception() + + companion object { + val DISABLE_DEPENDED_MODE_DIRECTIVE = "DISABLE_DEPENDED_MODE" + } }