From 19130cdd71249ac51ff458a6d35b31e255b95abf Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@gmail.com>
Date: Fri, 26 Feb 2016 18:52:07 +0100
Subject: [PATCH] Clean up KotlinMissingIfBranchFixer

---
 .../idea/editor/fixers/KotlinMissingIfBranchFixer.kt  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt
index ccd496107b6..3353d26b161 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt
@@ -17,11 +17,11 @@
 package org.jetbrains.kotlin.idea.editor.fixers
 
 import com.intellij.lang.SmartEnterProcessorWithFixers
-import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.psi.KtIfExpression
+import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler
 import org.jetbrains.kotlin.psi.KtBlockExpression
+import org.jetbrains.kotlin.psi.KtIfExpression
 
 class KotlinMissingIfBranchFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmartEnterHandler>() {
     override fun apply(editor: Editor, processor: KotlinSmartEnterHandler, element: PsiElement) {
@@ -32,7 +32,7 @@ class KotlinMissingIfBranchFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSma
         val elseKeyword = element.elseKeyword
 
         if (elseKeyword != null) {
-            if (elseBranch == null || elseBranch !is KtBlockExpression && elseBranch.startLine(editor.document) > elseKeyword.startLine(editor.document)) {
+            if (elseBranch == null || elseBranch !is KtBlockExpression && elseBranch.startLine(document) > elseKeyword.startLine(document)) {
                 document.insertString(elseKeyword.range.end, "{}")
                 return
             }
@@ -41,11 +41,10 @@ class KotlinMissingIfBranchFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSma
         val thenBranch = element.then
         if (thenBranch is KtBlockExpression) return
 
-        val rParen = element.rightParenthesis
-        if (rParen == null) return
+        val rParen = element.rightParenthesis ?: return
 
         var transformingOneLiner = false
-        if (thenBranch != null && thenBranch.startLine(editor.document) == element.startLine(editor.document)) {
+        if (thenBranch != null && thenBranch.startLine(document) == element.startLine(document)) {
             if (element.condition != null) return
             transformingOneLiner = true
         }