Tests: don't collect fixation logs in reversed tests as they have different order
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedDiagnosticsTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedDiagnosticsTest.kt
index 6b9634a..effafe8 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedDiagnosticsTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedDiagnosticsTest.kt
@@ -39,6 +39,7 @@
baseFirDiagnosticTestConfiguration(
frontendFacade = ::LowLevelFirFrontendFacade.bind(LLFirAnalyzerFacadeFactoryWithPreresolveInReversedOrder),
testDataConsistencyHandler = ::ReversedFirIdenticalChecker,
+ fixationLogsCollectionForbidden = true,
)
useAfterAnalysisCheckers(::LLFirOnlyReversedTestSuppressor)
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedSpecTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedSpecTest.kt
index 40e5dfd..842639b 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedSpecTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/AbstractLLReversedSpecTest.kt
@@ -18,6 +18,7 @@
baseFirDiagnosticTestConfiguration(
frontendFacade = ::LowLevelFirFrontendFacade.bind(LLFirAnalyzerFacadeFactoryWithPreresolveInReversedOrder),
testDataConsistencyHandler = ::ReversedFirIdenticalChecker,
+ fixationLogsCollectionForbidden = true,
)
baseFirSpecDiagnosticTestConfigurationForIde()
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.fixation.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.fixation.txt
deleted file mode 100644
index 8ce0975..0000000
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.fixation.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-CHOSEN for fixation: TypeVariable(S) --- FORBIDDEN
-********************************
-CHOSEN for fixation: TypeVariable(S) --- READY_FOR_FIXATION_LOWER
- >: TypeVariable(T)?
- >: kotlin/String!
- = kotlin/String!
- >: kotlin/Nothing?
- FIXED TO: kotlin/String!
-TypeVariable(T) --- READY_FOR_FIXATION_UPPER
- = kotlin/String
- <: kotlin/String!
-********************************
-CHOSEN for fixation: TypeVariable(K) --- READY_FOR_FIXATION_LOWER
- >: kotlin/String
- >: kotlin/String!
- = kotlin/String!
- FIXED TO: kotlin/String!
-********************************
-CHOSEN for fixation: TypeVariable(K) --- READY_FOR_FIXATION_LOWER
- >: kotlin/String
- >: kotlin/String!
- = kotlin/String!
- FIXED TO: kotlin/String!
-********************************
-CHOSEN for fixation: TypeVariable(T) --- READY_FOR_FIXATION_UPPER
- = kotlin/String
- <: kotlin/String!
- FIXED TO: kotlin/String
-********************************
-CHOSEN for fixation: TypeVariable(S) --- FORBIDDEN
-********************************
-CHOSEN for fixation: TypeVariable(S) --- READY_FOR_FIXATION_LOWER
- >: TypeVariable(T)?
- >: kotlin/String!
- = kotlin/String!
- >: kotlin/Nothing?
- FIXED TO: kotlin/String!
-TypeVariable(T) --- READY_FOR_FIXATION_UPPER
- = kotlin/String
- <: kotlin/String!
-********************************
-CHOSEN for fixation: TypeVariable(T) --- READY_FOR_FIXATION_UPPER
- = kotlin/String
- <: kotlin/String!
- FIXED TO: kotlin/String
-********************************
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.kt
deleted file mode 100644
index 62ca928..0000000
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/javaFunctionParamNullability.reversed.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-// RUN_PIPELINE_TILL: BACKEND
-// JVM_TARGET: 1.8
-// FIXATION_LOGS
-
-// FILE: Function.java
-public interface Function<I, O> {
- O fun(I param);
-}
-
-// FILE: Renderer.java
-public abstract class Renderer<R> {
- public static <S> Renderer<S> create(Function <? super S, String> getText) {
- return null;
- }
-}
-
-// FILE: Scheme.java
-
-import org.jetbrains.annotations.*;
-
-public interface Scheme {
- @NotNull default String getDisplayName() {
- return "";
- }
-}
-
-// FILE: Manager.java
-
-import org.jetbrains.annotations.*;
-
-public abstract class Manager {
- public abstract Scheme getScheme(@NotNull String schemeName);
-}
-
-// FILE: test.kt
-
-fun <T> comboBox(renderer: Renderer<in T?>? = null) {}
-
-fun test() {
- comboBox<String>(
- renderer = Renderer.create { // it should be flexible
- it.substring(1)
- }
- )
-}
-
-fun test2(manager: Manager) {
- comboBox<String>(
- renderer = Renderer.create { // it should be flexible
- when (it) {
- "" -> ""
- else -> manager.getScheme(it)?.displayName ?: it
- }
- }
- )
-}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/configuration/BaseDiagnosticConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/configuration/BaseDiagnosticConfiguration.kt
index c583b8f..4b96213 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/configuration/BaseDiagnosticConfiguration.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/configuration/BaseDiagnosticConfiguration.kt
@@ -116,6 +116,7 @@
@Suppress("unused") baseDir: String = ".",
frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>> = ::FirFrontendFacade,
testDataConsistencyHandler: Constructor<AfterAnalysisChecker> = ::FirTestDataConsistencyHandler,
+ fixationLogsCollectionForbidden: Boolean = false,
) {
globalDefaults {
frontend = FrontendKinds.FIR
@@ -133,9 +134,12 @@
::CommonEnvironmentConfigurator,
::JvmEnvironmentConfigurator,
::ScriptingEnvironmentConfigurator,
- ::FixationLogsCollectionConfigurator,
)
+ if (!fixationLogsCollectionForbidden) {
+ useConfigurators(::FixationLogsCollectionConfigurator)
+ }
+
useAdditionalSourceProviders(
::AdditionalDiagnosticsSourceFilesProvider,
::CoroutineHelpersSourceFilesProvider,
@@ -143,14 +147,16 @@
facadeStep(frontendFacade)
firHandlersStep {
- setupHandlersForDiagnosticTest()
+ setupHandlersForDiagnosticTest(fixationLogsCollectionForbidden)
}
useMetaInfoProcessors(::PsiLightTreeMetaInfoProcessor)
configureCommonDiagnosticTestPaths(testDataConsistencyHandler)
}
-fun HandlersStepBuilder<FirOutputArtifact, FrontendKinds.FIR>.setupHandlersForDiagnosticTest() {
+fun HandlersStepBuilder<FirOutputArtifact, FrontendKinds.FIR>.setupHandlersForDiagnosticTest(
+ fixationLogsCollectionForbidden: Boolean = false
+) {
useHandlers(
::FirDiagnosticsHandler,
::FirDumpHandler,
@@ -159,8 +165,10 @@
::FirCfgConsistencyHandler,
::FirResolvedTypesVerifier,
::FirScopeDumpHandler,
- ::FirFixationLogHandler,
)
+ if (!fixationLogsCollectionForbidden) {
+ useHandlers(::FirFixationLogHandler)
+ }
}
/**
