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

Fixed expected type for setter

Browse Source
This commit is contained in:
Valentin Kipyatkov
2017-05-24 22:56:37 +03:00
parent db0309c39d
commit d53aa28ddf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.kt
+2 -1
View File
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.codeInliner.CodeToInline
import org.jetbrains.kotlin.idea.codeInliner.CodeToInlineBuilder import org.jetbrains.kotlin.idea.codeInliner.CodeToInlineBuilder
import org.jetbrains.kotlin.idea.codeInliner.PropertyUsageReplacementStrategy import org.jetbrains.kotlin.idea.codeInliner.PropertyUsageReplacementStrategy
import org.jetbrains.kotlin.idea.core.copied import org.jetbrains.kotlin.idea.core.copied
import org.jetbrains.kotlin.idea.project.builtIns
import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.idea.references.ReferenceAccess import org.jetbrains.kotlin.idea.references.ReferenceAccess
@@ -101,7 +102,7 @@ class KotlinInlineValHandler : InlineActionHandler() {
else { else {
val descriptor = declaration.resolveToDescriptor() as PropertyDescriptor val descriptor = declaration.resolveToDescriptor() as PropertyDescriptor
readReplacement = getter?.let { buildCodeToInline(getter, descriptor.type, editor) ?: return } readReplacement = getter?.let { buildCodeToInline(getter, descriptor.type, editor) ?: return }
writeReplacement = setter?.let { buildCodeToInline(setter, descriptor.type, editor) ?: return } writeReplacement = setter?.let { buildCodeToInline(setter, setter.builtIns.unitType, editor) ?: return }
assignmentToDelete = null assignmentToDelete = null
} }