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

Fix compiler error discovered after switching to 1.4

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-01-17 18:29:25 +03:00
parent a5a75180a8
commit 689d1fff42
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k
import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.ContainerProvider
import com.intellij.codeInsight.NullableNotNullManager import com.intellij.codeInsight.NullableNotNullManager
import com.intellij.codeInsight.NullableNotNullManagerImpl
import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.codeInsight.runner.JavaMainMethodProvider
import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreApplicationEnvironment
import com.intellij.core.JavaCoreApplicationEnvironment 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 isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases)
override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true
override fun hasHardcodedContracts(element: PsiElement): Boolean = false override fun hasHardcodedContracts(element: PsiElement): Boolean = false
j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.191
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k
import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.ContainerProvider
import com.intellij.codeInsight.NullableNotNullManager import com.intellij.codeInsight.NullableNotNullManager
import com.intellij.codeInsight.NullableNotNullManagerImpl
import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.codeInsight.runner.JavaMainMethodProvider
import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreApplicationEnvironment
import com.intellij.core.JavaCoreApplicationEnvironment 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 isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases)
override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true
override fun hasHardcodedContracts(element: PsiElement): Boolean = false override fun hasHardcodedContracts(element: PsiElement): Boolean = false
j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt.193
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.j2k
import com.intellij.codeInsight.ContainerProvider import com.intellij.codeInsight.ContainerProvider
import com.intellij.codeInsight.NullableNotNullManager import com.intellij.codeInsight.NullableNotNullManager
import com.intellij.codeInsight.NullableNotNullManagerImpl
import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.codeInsight.runner.JavaMainMethodProvider
import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreApplicationEnvironment
import com.intellij.core.JavaCoreApplicationEnvironment 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 isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases)
override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true
override fun hasHardcodedContracts(element: PsiElement): Boolean = false override fun hasHardcodedContracts(element: PsiElement): Boolean = false