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

New J2K: Fix npe when converting java member without parent

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-28 16:39:46 +03:00
committed by Ilya Kirillov
parent 088241313a
commit ce666295f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/ModalityConversion.kt
+3 -3
View File
@@ -36,8 +36,8 @@ class ModalityConversion(private val context: ConversionContext) : RecursiveAppl
} }
private fun processMethod(method: JKJavaMethod) { private fun processMethod(method: JKJavaMethod) {
val psi = method.psi<PsiMethod>()!! val psi = method.psi<PsiMethod>() ?: return
val containingClass = method.parentOfType<JKClass>()!! val containingClass = method.parentOfType<JKClass>() ?: return
method.modality = when { method.modality = when {
method.modality != Modality.ABSTRACT method.modality != Modality.ABSTRACT
&& psi.findSuperMethods().isNotEmpty() -> Modality.OVERRIDE && psi.findSuperMethods().isNotEmpty() -> Modality.OVERRIDE
@@ -54,7 +54,7 @@ class ModalityConversion(private val context: ConversionContext) : RecursiveAppl
} }
private fun processField(field: JKField) { private fun processField(field: JKField) {
val containingClass = field.parentOfType<JKClass>()!! val containingClass = field.parentOfType<JKClass>() ?: return
if (containingClass.classKind == JKClass.ClassKind.INTERFACE) { if (containingClass.classKind == JKClass.ClassKind.INTERFACE) {
field.modality = Modality.FINAL field.modality = Modality.FINAL
} }