From 9e19546ba8dde50603cf30ccb1929e8f989b3836 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Tue, 21 Oct 2014 10:57:41 +0400 Subject: [PATCH] J2K: add default implementation for NullableNotNullManager --- j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt index 04be08a95bb..8f2799628f0 100644 --- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt +++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt @@ -19,7 +19,6 @@ package org.jetbrains.jet.j2k import com.intellij.core.JavaCoreApplicationEnvironment import com.intellij.core.JavaCoreProjectEnvironment import com.intellij.lang.java.JavaLanguage -import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiFile import com.intellij.psi.PsiFileFactory @@ -28,6 +27,7 @@ import org.jetbrains.jet.utils.PathUtil import java.io.File import java.net.URLClassLoader import com.intellij.codeInsight.NullableNotNullManager +import com.intellij.psi.PsiModifierListOwner public object JavaToKotlinTranslator { private val DISPOSABLE = Disposer.newDisposable() @@ -41,7 +41,10 @@ public object JavaToKotlinTranslator { val applicationEnvironment = JavaCoreApplicationEnvironment(DISPOSABLE) val javaCoreEnvironment = JavaCoreProjectEnvironment(DISPOSABLE, applicationEnvironment) - javaCoreEnvironment.getProject().registerService(javaClass(), NullableNotNullManager()) + javaCoreEnvironment.getProject().registerService(javaClass(), object : NullableNotNullManager() { + override fun isNullable(owner: PsiModifierListOwner, checkBases: Boolean) = !isNotNull(owner, checkBases) + override fun isNotNull(owner: PsiModifierListOwner, checkBases: Boolean) = true + }) for (root in PathUtil.getJdkClassesRoots()) { javaCoreEnvironment.addJarToClassPath(root)