From 871ad2b90936305c7de994868e072e7c9870ad6d Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 8 Oct 2020 20:52:57 +0900
Subject: [PATCH] Minor: Remove hard-coded 'Companion' name

---
 .../kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt
index 3e4d0f306d9..f3ac9062f50 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt
@@ -12,13 +12,16 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object JavaClassOnCompanionFixes : KotlinIntentionActionsFactory() {
     override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
         val expression = diagnostic.psiElement.parent as? KtDotQualifiedExpression ?: return emptyList()
-        val companionName = expression.receiverExpression.mainReference?.resolve()?.safeAs<KtObjectDeclaration>()?.name ?: "Companion"
+        val companionName = expression.receiverExpression.mainReference?.resolve()?.safeAs<KtObjectDeclaration>()?.name
+            ?: SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.identifier
+
         return listOf(
             ReplaceWithCompanionClassJavaFix(expression, companionName),
             ReplaceWithClassJavaFix(expression)