azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off BooleanElvisBoundSmartCasts in 1.3

Browse Source 
See KT-26357
This commit is contained in:
Dmitry Savvinov
2018-08-23 13:56:43 +03:00
committed by Ilya Gorbunov
parent 3607ed85ab
commit 4929f457ed
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfoImpl.kt
+1 -2
View File
@@ -64,8 +64,7 @@ internal class DataFlowInfoImpl private constructor(
nullability: Nullability, nullability: Nullability,
languageVersionSettings: LanguageVersionSettings, languageVersionSettings: LanguageVersionSettings,
newTypeInfoBuilder: SetMultimap<DataFlowValue, KotlinType>? = null, newTypeInfoBuilder: SetMultimap<DataFlowValue, KotlinType>? = null,
// TODO: remove me in version 1.3! I'm very dirty hack! // XXX: set to false only as a workaround for OI, see KT-26357 for details (in NI everything works automagically)
// In normal circumstances this should be always true
recordUnstable: Boolean = true recordUnstable: Boolean = true
) { ) {
if (value.isStable || recordUnstable) { if (value.isStable || recordUnstable) {
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+2 -1
View File
@@ -57,7 +57,6 @@ enum class LanguageFeature(
ExpectedTypeFromCast(KOTLIN_1_2), ExpectedTypeFromCast(KOTLIN_1_2),
DefaultMethodsCallFromJava6TargetError(KOTLIN_1_2), DefaultMethodsCallFromJava6TargetError(KOTLIN_1_2),
BooleanElvisBoundSmartCasts(KOTLIN_1_3),
RestrictionOfValReassignmentViaBackingField(KOTLIN_1_3, kind = BUG_FIX), RestrictionOfValReassignmentViaBackingField(KOTLIN_1_3, kind = BUG_FIX),
NestedClassesInEnumEntryShouldBeInner(KOTLIN_1_3, kind = BUG_FIX), NestedClassesInEnumEntryShouldBeInner(KOTLIN_1_3, kind = BUG_FIX),
ProhibitDataClassesOverridingCopy(KOTLIN_1_3, kind = BUG_FIX), ProhibitDataClassesOverridingCopy(KOTLIN_1_3, kind = BUG_FIX),
@@ -104,6 +103,8 @@ enum class LanguageFeature(
MultiPlatformProjects(sinceVersion = null, defaultState = State.DISABLED), MultiPlatformProjects(sinceVersion = null, defaultState = State.DISABLED),
NewInference(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), NewInference(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED),
// This feature can be enabled only along with new inference, see KT-26357 for details
BooleanElvisBoundSmartCasts(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED),
SamConversionForKotlinFunctions(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED), SamConversionForKotlinFunctions(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED),