From 6cc4d70b07300f6c4b0b862337f34b7a38d69914 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sat, 24 Oct 2020 00:18:44 +0900 Subject: [PATCH] Revert "Minor: Remove hard-coded 'Companion' name" This reverts commit 871ad2b9 --- .../kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt index f3ac9062f50..3e4d0f306d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt @@ -12,16 +12,13 @@ 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 { val expression = diagnostic.psiElement.parent as? KtDotQualifiedExpression ?: return emptyList() - val companionName = expression.receiverExpression.mainReference?.resolve()?.safeAs()?.name - ?: SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.identifier - + val companionName = expression.receiverExpression.mainReference?.resolve()?.safeAs()?.name ?: "Companion" return listOf( ReplaceWithCompanionClassJavaFix(expression, companionName), ReplaceWithClassJavaFix(expression)