From 830e3ba073b9cce53fb48f1de583a2536e7b6718 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 6 May 2015 14:11:04 +0300
Subject: [PATCH] Better code in j2k

---
 j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt | 2 +-
 j2k/src/org/jetbrains/kotlin/j2k/Utils.kt                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
index 2bba338966d..38163250d37 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
@@ -265,7 +265,7 @@ class ConstructorConverter(
                     if (target is PsiParameter) {
                         val scope = target.getDeclarationScope()
                         // we do not check for exactly this constructor because default values reference parameters in other constructors
-                        if (scope.isConstructor() && scope.getParent() == psiClass) {
+                        if (scope is PsiMember && scope.isConstructor() && scope.getParent() == psiClass) {
                             return Identifier(replacement, codeConverter.typeConverter.variableNullability(target).isNullable(codeConverter.settings))
                         }
                     }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
index fd31134d0c6..c7bf2db8f5b 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
@@ -92,8 +92,8 @@ fun PsiElement.isInSingleLine(): Boolean {
 
     var child = getFirstChild()
     while (child != null) {
-        if (!child!!.isInSingleLine()) return false
-        child = child!!.getNextSibling()
+        if (!child.isInSingleLine()) return false
+        child = child.getNextSibling()
     }
     return true
 }
@@ -102,7 +102,7 @@ fun PsiElement.isInSingleLine(): Boolean {
 fun PsiElement.getContainingMethod(): PsiMethod? {
     var context = getContext()
     while (context != null) {
-        val _context = context!!
+        val _context = context
         if (_context is PsiMethod) return _context
         context = _context.getContext()
     }
@@ -114,7 +114,7 @@ fun PsiElement.getContainingConstructor(): PsiMethod? {
     return if (method?.isConstructor() == true) method else null
 }
 
-fun PsiElement.isConstructor(): Boolean = this is PsiMethod && this.isConstructor()
+fun PsiMember.isConstructor(): Boolean = this is PsiMethod && this.isConstructor()
 
 fun PsiModifierListOwner.accessModifier(): String = when {
     hasModifierProperty(PsiModifier.PUBLIC) -> PsiModifier.PUBLIC