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

No KotlinType reference in NumberConversionFix

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-03-29 17:11:46 +03:00
parent 3ad292697a
commit 3905344530
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/NumberConversionFix.kt
+10 -10
View File
@@ -31,21 +31,21 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType
class NumberConversionFix(element: KtExpression, private val type: KotlinType) : KotlinQuickFixAction<KtExpression>(element) { class NumberConversionFix(element: KtExpression, type: KotlinType) : KotlinQuickFixAction<KtExpression>(element) {
private val isConversionAvailable: Boolean = run {
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean { val expressionType = element.analyze(BodyResolveMode.PARTIAL).getType(element)
if (!super.isAvailable(project, editor, file)) return false expressionType != null && expressionType != type && expressionType.isPrimitiveNumberType() && type.isPrimitiveNumberType()
val expressionType = element.analyze(BodyResolveMode.PARTIAL).getType(element) ?: return false
return expressionType != type && expressionType.isPrimitiveNumberType() && type.isPrimitiveNumberType()
} }
private val typePresentation = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile)
= isConversionAvailable && super.isAvailable(project, editor, file)
override fun getFamilyName() = "Insert number conversion" override fun getFamilyName() = "Insert number conversion"
override fun getText() = "Convert expression to '${IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)}'" override fun getText() = "Convert expression to '$typePresentation'"
override fun invoke(project: Project, editor: Editor?, file: KtFile) { override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type) val expressionToInsert = KtPsiFactory(file).createExpressionByPattern("$0.to$1()", element, typePresentation)
val expressionToInsert = KtPsiFactory(file).createExpressionByPattern("$0.to$1()", element, renderedType)
val newExpression = element.replaced(expressionToInsert) val newExpression = element.replaced(expressionToInsert)
editor?.caretModel?.moveToOffset(newExpression.endOffset) editor?.caretModel?.moveToOffset(newExpression.endOffset)
} }