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

182: Fix toNullability clash in j2k

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-06-09 16:51:24 +03:00
parent 411afb0303
commit 7fb2452dba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
+3 -3
View File
@@ -47,12 +47,12 @@ object IdeaSuperMethodSearcher : SuperMethodsSearcher {
private object IdeaJavaDataFlowAnalyzerFacade : JavaDataFlowAnalyzerFacade { private object IdeaJavaDataFlowAnalyzerFacade : JavaDataFlowAnalyzerFacade {
override fun variableNullability(variable: PsiVariable, context: PsiElement): Nullability = override fun variableNullability(variable: PsiVariable, context: PsiElement): Nullability =
DfaUtil.checkNullness(variable, context).toNullability() DfaUtil.checkNullness(variable, context).toJ2KNullability()
override fun methodNullability(method: PsiMethod): Nullability = override fun methodNullability(method: PsiMethod): Nullability =
DfaUtil.inferMethodNullity(method).toNullability() DfaUtil.inferMethodNullity(method).toJ2KNullability()
private fun Nullness.toNullability() = when (this) { private fun Nullness.toJ2KNullability() = when (this) {
Nullness.UNKNOWN -> Nullability.Default Nullness.UNKNOWN -> Nullability.Default
Nullness.NOT_NULL -> Nullability.NotNull Nullness.NOT_NULL -> Nullability.NotNull
Nullness.NULLABLE -> Nullability.Nullable Nullness.NULLABLE -> Nullability.Nullable