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

No KotlinType reference in ChangeFunctionReturnTypeFix

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-03-29 15:44:48 +03:00
parent 41c09700e8
commit 3467ac7438
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt
+13 -10
View File
@@ -43,12 +43,16 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.ErrorUtils
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
import org.jetbrains.kotlin.types.typeUtil.isUnit
import java.util.* import java.util.*
class ChangeFunctionReturnTypeFix(element: KtFunction, private val type: KotlinType) : KotlinQuickFixAction<KtFunction>(element) { class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : KotlinQuickFixAction<KtFunction>(element) {
private val changeFunctionLiteralReturnTypeFix: ChangeFunctionLiteralReturnTypeFix? private val changeFunctionLiteralReturnTypeFix: ChangeFunctionLiteralReturnTypeFix?
private val typeContainsError = ErrorUtils.containsErrorType(type)
private val typePresentation = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
private val typeSourceCode = IdeDescriptorRenderers.SOURCE_CODE.renderType(type)
private val isUnitType = KotlinBuiltIns.isUnit(type)
init { init {
if (element is KtFunctionLiteral) { if (element is KtFunctionLiteral) {
val functionLiteralExpression = PsiTreeUtil.getParentOfType(element, KtLambdaExpression::class.java) ?: error("FunctionLiteral outside any FunctionLiteralExpression: " + element.getElementTextWithContext()) val functionLiteralExpression = PsiTreeUtil.getParentOfType(element, KtLambdaExpression::class.java) ?: error("FunctionLiteral outside any FunctionLiteralExpression: " + element.getElementTextWithContext())
@@ -66,35 +70,34 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, private val type: KotlinT
val functionName = element.fqName?.asString() ?: element.name val functionName = element.fqName?.asString() ?: element.name
if (KotlinBuiltIns.isUnit(type) && element.hasBlockBody()) { if (isUnitType && element.hasBlockBody()) {
return if (functionName == null) return if (functionName == null)
KotlinBundle.message("remove.no.name.function.return.type") KotlinBundle.message("remove.no.name.function.return.type")
else else
KotlinBundle.message("remove.function.return.type", functionName) KotlinBundle.message("remove.function.return.type", functionName)
} }
val renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
return if (functionName == null) return if (functionName == null)
KotlinBundle.message("change.no.name.function.return.type", renderedType) KotlinBundle.message("change.no.name.function.return.type", typePresentation)
else else
KotlinBundle.message("change.function.return.type", functionName, renderedType) KotlinBundle.message("change.function.return.type", functionName, typePresentation)
} }
override fun getFamilyName() = KotlinBundle.message("change.type.family") override fun getFamilyName() = KotlinBundle.message("change.type.family")
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean { override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
return super.isAvailable(project, editor, file) && return super.isAvailable(project, editor, file) &&
!ErrorUtils.containsErrorType(type) && !typeContainsError &&
element !is KtConstructor<*> element !is KtConstructor<*>
} }
override operator fun invoke(project: Project, editor: Editor?, file: KtFile) { override fun invoke(project: Project, editor: Editor?, file: KtFile) {
if (changeFunctionLiteralReturnTypeFix != null) { if (changeFunctionLiteralReturnTypeFix != null) {
changeFunctionLiteralReturnTypeFix.invoke(project, editor!!, file) changeFunctionLiteralReturnTypeFix.invoke(project, editor!!, file)
} }
else { else {
if (!(type.isUnit() && element.hasBlockBody())) { if (!(isUnitType && element.hasBlockBody())) {
var newTypeRef = KtPsiFactory(project).createType(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)) var newTypeRef = KtPsiFactory(project).createType(typeSourceCode)
newTypeRef = element.setTypeReference(newTypeRef)!! newTypeRef = element.setTypeReference(newTypeRef)!!
ShortenReferences.DEFAULT.process(newTypeRef) ShortenReferences.DEFAULT.process(newTypeRef)
} }