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

Reverts commit 2472966

Browse Source 
(Remove unused function parameter: minor improvement)
Transformation was not equivalent due to change signature in between
This revert fixes broken quick-fix tests (remove parameter based)
This commit is contained in:
Mikhail Glukhikh
2018-01-30 18:41:46 +03:00
parent d0b232c172
commit 6fbf5a8904
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
+2 -2
View File
@@ -38,15 +38,15 @@ class RemoveUnusedFunctionParameterFix(parameter: KtParameter) : KotlinQuickFixA
override fun invoke(project: Project, editor: Editor?, file: KtFile) { override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return val element = element ?: return
val primaryConstructor = element.parent?.parent as? KtPrimaryConstructor
val parameterList = element.parent as? KtParameterList
val context = element.analyze() val context = element.analyze()
val parameterDescriptor = context[BindingContext.VALUE_PARAMETER, element] as? ValueParameterDescriptor ?: return val parameterDescriptor = context[BindingContext.VALUE_PARAMETER, element] as? ValueParameterDescriptor ?: return
ChangeFunctionSignatureFix.runRemoveParameter(parameterDescriptor, element) ChangeFunctionSignatureFix.runRemoveParameter(parameterDescriptor, element)
val parameterList = element.parent as? KtParameterList
val nextParameter = parameterList?.parameters?.getOrNull(parameterDescriptor.index) val nextParameter = parameterList?.parameters?.getOrNull(parameterDescriptor.index)
if (nextParameter != null) { if (nextParameter != null) {
editor?.caretModel?.moveToOffset(nextParameter.startOffset) editor?.caretModel?.moveToOffset(nextParameter.startOffset)
} }
val primaryConstructor = element.parent?.parent as? KtPrimaryConstructor
if (primaryConstructor != null) { if (primaryConstructor != null) {
val removeConstructorIntention = RemoveEmptyPrimaryConstructorIntention() val removeConstructorIntention = RemoveEmptyPrimaryConstructorIntention()
if (removeConstructorIntention.isApplicableTo(primaryConstructor)) { if (removeConstructorIntention.isApplicableTo(primaryConstructor)) {