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

No KotlinType reference in ConvertClassToKClassFix

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-03-29 21:44:54 +03:00
parent 40e69318b8
commit 2ac627efd3
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ConvertClassToKClassFix.kt
+18 -18
View File
@@ -41,32 +41,32 @@ private fun KotlinType.isJClass(): Boolean {
return expressionTypeFqName == JAVA_LANG_CLASS_FQ_NAME
}
class ConvertClassToKClassFix(element: KtDotQualifiedExpression, private val type: KotlinType) : KotlinQuickFixAction<KtDotQualifiedExpression>(element) {
class ConvertClassToKClassFix(element: KtDotQualifiedExpression, type: KotlinType) : KotlinQuickFixAction<KtDotQualifiedExpression>(element) {
private val isApplicable: Boolean = run {
val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
val expressionType = bindingContext.getType(element) ?: return@run false
if (!expressionType.isJClass()) return@run false
val children = element.children
if (children.size != 2) return@run false
val firstChild = children.first() as? KtExpression ?: return@run false
val firstChildType = bindingContext.getType(firstChild) ?: return@run false
return@run firstChildType.isSubtypeOf(type)
}
override fun getText() = "Remove '.${element.children.lastOrNull()?.text}'"
override fun getFamilyName() = "Remove conversion from 'KClass' to 'Class'"
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
if (!super.isAvailable(project, editor, file)) return false
val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
val expressionType = bindingContext.getType(element) ?: return false
if (!expressionType.isJClass()) return false
val children = element.children
if (children.size != 2) return false
val firstChild = children.first() as? KtExpression ?: return false
val firstChildType = bindingContext.getType(firstChild) ?: return false
return firstChildType.isSubtypeOf(type)
}
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile)
= isApplicable && super.isAvailable(project, editor, file)
override fun invoke(project: Project, editor: Editor?, file: KtFile) {
element.replace(element.firstChild)
}
object Factory : KotlinIntentionActionsFactory() {
companion object Factory : KotlinIntentionActionsFactory() {
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val casted = Errors.TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH.cast(diagnostic)
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+1 -1
View File
@@ -337,7 +337,7 @@ class QuickFixRegistrar : QuickFixContributor {
UPPER_BOUND_VIOLATED.registerFactory(AddGenericUpperBoundFix.Factory)
TYPE_INFERENCE_UPPER_BOUND_VIOLATED.registerFactory(AddGenericUpperBoundFix.Factory)
TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH.registerFactory(ConvertClassToKClassFix.Factory)
TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH.registerFactory(ConvertClassToKClassFix)
NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION.registerFactory(ConstFixFactory)