Disable ContracsDSL in 1.3

2018-07-05 10:42:11 +03:00
parent 984ef9c3b1
commit 6d733ff7b9
12 changed files with 23 additions and 12 deletions
@@ -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))