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

J2K: add default implementation for NullableNotNullManager

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-10-21 10:57:41 +04:00
parent 82d5e044c7
commit 9e19546ba8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
+5 -2
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.j2k
import com.intellij.core.JavaCoreApplicationEnvironment import com.intellij.core.JavaCoreApplicationEnvironment
import com.intellij.core.JavaCoreProjectEnvironment import com.intellij.core.JavaCoreProjectEnvironment
import com.intellij.lang.java.JavaLanguage import com.intellij.lang.java.JavaLanguage
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import com.intellij.psi.PsiFileFactory import com.intellij.psi.PsiFileFactory
@@ -28,6 +27,7 @@ import org.jetbrains.jet.utils.PathUtil
import java.io.File import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
import com.intellij.codeInsight.NullableNotNullManager import com.intellij.codeInsight.NullableNotNullManager
import com.intellij.psi.PsiModifierListOwner
public object JavaToKotlinTranslator { public object JavaToKotlinTranslator {
private val DISPOSABLE = Disposer.newDisposable() private val DISPOSABLE = Disposer.newDisposable()
@@ -41,7 +41,10 @@ public object JavaToKotlinTranslator {
val applicationEnvironment = JavaCoreApplicationEnvironment(DISPOSABLE) val applicationEnvironment = JavaCoreApplicationEnvironment(DISPOSABLE)
val javaCoreEnvironment = JavaCoreProjectEnvironment(DISPOSABLE, applicationEnvironment) val javaCoreEnvironment = JavaCoreProjectEnvironment(DISPOSABLE, applicationEnvironment)
javaCoreEnvironment.getProject().registerService(javaClass<NullableNotNullManager>(), NullableNotNullManager()) javaCoreEnvironment.getProject().registerService(javaClass<NullableNotNullManager>(), 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()) { for (root in PathUtil.getJdkClassesRoots()) {
javaCoreEnvironment.addJarToClassPath(root) javaCoreEnvironment.addJarToClassPath(root)