From 339b1a38958830eba25401a581605b8229d30444 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 21 Jul 2017 13:49:05 +0300
Subject: [PATCH] Minor: cleanup

---
 .../idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt | 6 +++---
 .../quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt  | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
index 3afc6bf924d..3c0518cde24 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
@@ -21,23 +21,23 @@ import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
 import org.jetbrains.kotlin.idea.core.moveCaret
 import org.jetbrains.kotlin.idea.core.targetDescriptors
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
-import org.jetbrains.kotlin.idea.codeInliner.UsageReplacementStrategy
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny
 
 class DeprecatedSymbolUsageFix(
-        element: KtSimpleNameExpression/*TODO?*/,
+        element: KtSimpleNameExpression,
         replaceWith: ReplaceWith
 ) : DeprecatedSymbolUsageFixBase(element, replaceWith), CleanupFix, HighPriorityAction {
 
     override fun getFamilyName() = "Replace deprecated symbol usage"
 
-    override fun getText() = "Replace with '${replaceWith.pattern}'" //TODO: substitute?
+    override fun getText() = "Replace with '${replaceWith.pattern}'"
 
     override fun invoke(replacementStrategy: UsageReplacementStrategy, project: Project, editor: Editor?) {
         val element = element ?: return
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
index baa42113ad9..da92c15a41c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt
@@ -102,14 +102,6 @@ abstract class DeprecatedSymbolUsageFixBase(
         fun extractDataFromDiagnostic(deprecatedDiagnostic: Diagnostic): Data? {
             val psiElement = deprecatedDiagnostic.psiElement
 
-            //TODO: compiler crash here
-            /*
-                        val nameExpression: JetSimpleNameExpression = when (psiElement) {
-                            is JetSimpleNameExpression -> psiElement
-                            is JetConstructorCalleeExpression -> psiElement.constructorReferenceExpression
-                            else -> null
-                        } ?: return null
-            */
             val nameExpression: KtSimpleNameExpression = when (psiElement) {
                 is KtSimpleNameExpression -> psiElement
                 is KtConstructorCalleeExpression -> psiElement.constructorReferenceExpression