From 42945d33ee29d43ef9c3e86a09a1f48df32f2ae6 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 24 Oct 2017 16:18:13 +0300 Subject: [PATCH] Use !LANGUAGE directive in tests for enhanced nullability --- .../enhancedNullability/inFunctionWithExpressionBody.kt | 2 +- .../inFunctionWithExpressionBodyWithJavaGeneric.kt | 2 +- .../enhancedNullability/inLocalFunctionWithExpressionBody.kt | 2 +- .../enhancedNullability/inLocalVariableInitializer.kt | 2 +- .../enhancedNullability/inMemberPropertyInitializer.kt | 2 +- .../enhancedNullability/inPropertyGetterWithExpressionBody.kt | 2 +- .../enhancedNullability/inTopLevelPropertyInitializer.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBody.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBody.kt index f7b2c2654df..46bc59870f2 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBody.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBody.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String { diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt index 74e2c3a70bf..37a4170a3e3 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inFunctionWithExpressionBodyWithJavaGeneric.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // See KT-8135 // We could generate runtime assertion on call site for 'generic()' below. diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalFunctionWithExpressionBody.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalFunctionWithExpressionBody.kt index 29dc4850156..6143a62967a 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalFunctionWithExpressionBody.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalFunctionWithExpressionBody.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String { diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalVariableInitializer.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalVariableInitializer.kt index 6c2df07de45..f325af45e5b 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalVariableInitializer.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inLocalVariableInitializer.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String { diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inMemberPropertyInitializer.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inMemberPropertyInitializer.kt index 38c8d587615..9dbd3a9f590 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inMemberPropertyInitializer.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inMemberPropertyInitializer.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String { diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inPropertyGetterWithExpressionBody.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inPropertyGetterWithExpressionBody.kt index 84f13f3a8c0..ac1d75a44af 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inPropertyGetterWithExpressionBody.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inPropertyGetterWithExpressionBody.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String { diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inTopLevelPropertyInitializer.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inTopLevelPropertyInitializer.kt index 5d2e21b1d53..4066f0bbdc1 100644 --- a/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inTopLevelPropertyInitializer.kt +++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/enhancedNullability/inTopLevelPropertyInitializer.kt @@ -1,5 +1,5 @@ +// !LANGUAGE: +StrictJavaNullabilityAssertions // TARGET_BACKEND: JVM -// STRICT_JAVA_NULLABILITY_ASSERTIONS // FILE: box.kt fun box(): String {