Add quickfix for @receiver applied to extension member instead of type

So #KT-14648 Fixed
This commit is contained in:
Kirill Rakhman
2017-05-29 21:17:14 +03:00
committed by Mikhail Glukhikh
parent b206f6288d
commit 08bd212d82
9 changed files with 139 additions and 0 deletions
@@ -0,0 +1,59 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
class MoveReceiverAnnotationFix(element: KtAnnotationEntry) : KotlinQuickFixAction<KtAnnotationEntry>(element) {
override fun getFamilyName() = "Move annotation to receiver type"
override fun getText() = familyName
override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return
val declaration = element.getParentOfType<KtCallableDeclaration>(true) ?: return
val receiverTypeRef = declaration.receiverTypeReference ?: return
receiverTypeRef.addAnnotationEntry(element)
element.delete()
}
companion object Factory : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val diag = Errors.INAPPLICABLE_RECEIVER_TARGET.cast(diagnostic)
val entry = diag.psiElement as? KtAnnotationEntry ?: return null
val declaration = entry.getParentOfType<KtCallableDeclaration>(true) ?: return null
if (declaration.receiverTypeReference == null) return null
return MoveReceiverAnnotationFix(entry)
}
}
}
fun String.foo() {
}
@@ -494,5 +494,7 @@ class QuickFixRegistrar : QuickFixContributor {
MUST_BE_INITIALIZED_OR_BE_ABSTRACT.registerFactory(AddModifierFix.AddLateinitFactory)
RETURN_NOT_ALLOWED.registerFactory(ChangeToLabeledReturnFix)
INAPPLICABLE_RECEIVER_TARGET.registerFactory(MoveReceiverAnnotationFix)
}
}