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

Disable ContracsDSL in 1.3

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-07-05 10:42:11 +03:00
parent 984ef9c3b1
commit 6d733ff7b9
12 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/contracts/parsing/ContractParsingServices.kt
+11 -1
View File
@@ -48,7 +48,17 @@ class ContractParsingServices(val languageVersionSettings: LanguageVersionSettin
languageVersionSettings.getFlag(AnalysisFlag.Flags.allowKotlinPackage)
val contractDescriptor = when {
!isFeatureTurnedOn || !isContractDescriptionCallPreciseCheck(expression, trace.bindingContext) -> null
!isContractDescriptionCallPreciseCheck(expression, trace.bindingContext) -> null
!isFeatureTurnedOn -> {
trace.report(
Errors.UNSUPPORTED_FEATURE.on(
expression,
LanguageFeature.AllowContractsForCustomFunctions to languageVersionSettings
)
)
null
}
!isContractAllowedHere(scope) || !isFirstStatement -> {
trace.report(Errors.CONTRACT_NOT_ALLOWED.on(expression))
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/callsEffect.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/deeplyNestedExpression.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/embedding.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/fromStandardKt.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/isInstancePredicate.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/logicOperators.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/multieffectContracts.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/mutualRecursion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/recursion.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/testData/loadJava/compiledKotlinWithStdlib/contracts/withReceiver.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.3
// !LANGUAGE: +AllowContractsForCustomFunctions +ReadDeserializedContracts
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package test
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+2 -1
View File
@@ -74,7 +74,6 @@ enum class LanguageFeature(
UseReturnsEffect(KOTLIN_1_3),
UseCallsInPlaceEffect(KOTLIN_1_3),
VariableDeclarationInWhenSubject(KOTLIN_1_3),
AllowContractsForCustomFunctions(KOTLIN_1_3, kind = UNSTABLE_FEATURE),
ProhibitLocalAnnotations(KOTLIN_1_3, kind = BUG_FIX),
ProhibitSmartcastsOnLocalDelegatedProperty(KOTLIN_1_3, kind = BUG_FIX),
ProhibitOperatorMod(KOTLIN_1_3, kind = BUG_FIX),
@@ -90,6 +89,8 @@ enum class LanguageFeature(
State.ENABLED_WITH_WARNING
),
AllowContractsForCustomFunctions(sinceVersion = null, defaultState = State.DISABLED, kind = UNSTABLE_FEATURE),
MultiPlatformProjects(sinceVersion = null, defaultState = State.DISABLED),
NewInference(sinceVersion = KOTLIN_1_3, defaultState = State.DISABLED),