azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: Remove hard-coded 'Companion' name

Browse Source
This commit is contained in:
Yan Zhulanow
2020-10-08 20:52:57 +09:00
parent 15a615d63b
commit 871ad2b909
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/JavaClassOnCompanionFixes.kt
+4 -1
View File
@@ -12,13 +12,16 @@ import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
object JavaClassOnCompanionFixes : KotlinIntentionActionsFactory() { object JavaClassOnCompanionFixes : KotlinIntentionActionsFactory() {
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> { override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val expression = diagnostic.psiElement.parent as? KtDotQualifiedExpression ?: return emptyList() 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( return listOf(
ReplaceWithCompanionClassJavaFix(expression, companionName), ReplaceWithCompanionClassJavaFix(expression, companionName),
ReplaceWithClassJavaFix(expression) ReplaceWithClassJavaFix(expression)