From 689d1fff42f49c970f19f8f2379ea9fc782f4856 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 17 Jan 2020 18:29:25 +0300 Subject: [PATCH] Fix compiler error discovered after switching to 1.4 --- .../kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt | 3 ++- .../j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191 | 3 ++- .../j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt index dfed38f4584..fb7dde64b25 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.NullableNotNullManager +import com.intellij.codeInsight.NullableNotNullManagerImpl import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.JavaCoreApplicationEnvironment @@ -73,7 +74,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } } - javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManager(javaCoreEnvironment.project) { + javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManagerImpl(javaCoreEnvironment.project) { override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun hasHardcodedContracts(element: PsiElement): Boolean = false diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191 index f9be4d4a121..9ccbcc694af 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191 +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191 @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.NullableNotNullManager +import com.intellij.codeInsight.NullableNotNullManagerImpl import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.JavaCoreApplicationEnvironment @@ -73,7 +74,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } } - javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManager(javaCoreEnvironment.project) { + javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManagerImpl(javaCoreEnvironment.project) { override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun hasHardcodedContracts(element: PsiElement): Boolean = false diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 index d3eecdc26f6..44f97066eb6 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193 @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.NullableNotNullManager +import com.intellij.codeInsight.NullableNotNullManagerImpl import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.JavaCoreApplicationEnvironment @@ -74,7 +75,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } } - javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManager(javaCoreEnvironment.project) { + javaCoreEnvironment.project.registerService(NullableNotNullManager::class.java, object : NullableNotNullManagerImpl(javaCoreEnvironment.project) { override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun hasHardcodedContracts(element: PsiElement): Boolean = false