Minor: invert if, clean up

idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt

@@ -133,8 +133,10 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
             -1
         }
 
+        if (lineNumber < 0) {
+            throw NoDataException.INSTANCE
+        }
 
-        if (lineNumber >= 0) {
         val lambdaOrFunIfInside = getLambdaOrFunIfInside(location, psiFile as KtFile, lineNumber)
         if (lambdaOrFunIfInside != null) {
             return SourcePosition.createFromElement(lambdaOrFunIfInside.bodyExpression!!)
@@ -146,9 +148,6 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
         return SourcePosition.createFromLine(psiFile, lineNumber)
     }
 
-        throw NoDataException.INSTANCE
-    }
-
     private fun getParameterIfInConstructor(location: Location, file: KtFile, lineNumber: Int): KtParameter? {
         val lineStartOffset = file.getLineStartOffset(lineNumber) ?: return null
         val elementAt = file.findElementAt(lineStartOffset)
@@ -281,10 +280,9 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
         if (DumbService.getInstance(myDebugProcess.project).isDumb) {
             return emptyList()
         }
-        else {
+
         val baseElement = getElementToCalculateClassName(element) ?: return emptyList()
-            return getOrComputeClassNames(baseElement) {
+        return getOrComputeClassNames(baseElement) { element ->
-                element ->
             val file = element.readAction { it.containingFile as KtFile }
             val isInLibrary = LibraryUtil.findLibraryEntry(file.virtualFile, file.project) != null
             val typeMapper = KotlinDebuggerCaches.getOrCreateTypeMapper(element)
@@ -292,7 +290,6 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
             getInternalClassNameForElement(element, typeMapper, file, isInLibrary, withInlines)
         }
     }
-    }
 
     private fun findLambdas(sourcePosition: SourcePosition): Collection<String> {
         val lambdas = sourcePosition.readAction { getLambdasAtLineIfAny(it) }

idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt

@@ -22,8 +22,6 @@ import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiManager
-import com.intellij.psi.impl.PsiModificationTrackerImpl
 import com.intellij.util.ExceptionUtil
 import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -214,7 +212,7 @@ private fun getExpressionToAddDebugExpressionBefore(tmpFile: KtFile, contextElem
 
     fun shouldStop(el: PsiElement?, p: PsiElement?) = p is KtBlockExpression || el is KtDeclaration || el is KtFile
 
-    var elementAt = tmpFile.findContextElement()
+    val elementAt = tmpFile.findContextElement()
 
     var parent = elementAt?.parent
     if (shouldStop(elementAt, parent)) {