diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/types/TypeApproximatorConfiguration.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/types/TypeApproximatorConfiguration.kt index 91f8ebda366..f9d5a5b0c10 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/types/TypeApproximatorConfiguration.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/types/TypeApproximatorConfiguration.kt @@ -105,6 +105,7 @@ open class TypeApproximatorConfiguration { object FinalApproximationAfterResolutionAndInference : AbstractCapturedTypesApproximation(CaptureStatus.FROM_EXPRESSION) { override val integerLiteralConstantType: Boolean get() = true + override val integerConstantOperatorType: Boolean get() = true override val intersectionTypesInContravariantPositions: Boolean get() = true override val convertToNonRawVersionAfterApproximationInK2: Boolean get() = true diff --git a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.kt b/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.kt deleted file mode 100644 index 0860e224a5b..00000000000 --- a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.kt +++ /dev/null @@ -1,9 +0,0 @@ -// WITH_STDLIB -// FIR_DUMP - -fun foo() { - ")!>foo(1 to 2) - val x = foo(3 to 4) -} - -fun > foo(vararg values: Pair): List = TODO() diff --git a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.txt b/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.txt index 54f87123fbe..896878a2f11 100644 --- a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.txt +++ b/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.fir.txt @@ -1,7 +1,7 @@ -FILE: literalInCompletedGeneric.fir.kt +FILE: literalInCompletedGeneric.kt public final fun foo(): R|kotlin/Unit| { R|/foo|(vararg(Int(1).R|kotlin/to|(Int(2)))) - lval x: R|kotlin/collections/List| = R|/foo|(vararg(Int(3).R|kotlin/to|(Int(4)))) + lval x: R|kotlin/collections/List| = R|/foo|(vararg(Int(3).R|kotlin/to|(Int(4)))) } public final fun |> foo(vararg values: R|kotlin/Array>|): R|kotlin/collections/List| { ^foo R|kotlin/TODO|() diff --git a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.kt b/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.kt index 3dc9c0e8c67..5b9e5eaaba5 100644 --- a/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.kt +++ b/compiler/testData/diagnostics/tests/integerLiterals/literalInCompletedGeneric.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_STDLIB // FIR_DUMP