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

Extract Superclass/Interface: show inapplicability error before choosing the extraction container

Browse Source 
#KT-15339 Fixed
This commit is contained in:
Alexey Sedunov
2017-03-01 14:23:53 +03:00
parent eb9c775476
commit 071744a57f
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractInterfaceHandler.kt
-2
View File
@@ -33,8 +33,6 @@ object KotlinExtractInterfaceHandler : KotlinExtractSuperHandlerBase(true) {
}
override fun doInvoke(klass: KtClassOrObject, targetParent: PsiElement, project: Project, editor: Editor?) {
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, klass)) return
KotlinExtractInterfaceDialog(
originalClass = klass,
targetParent = targetParent,
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperHandlerBase.kt
+24
View File
@@ -24,9 +24,12 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.HelpID
import com.intellij.refactoring.RefactoringActionHandler
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.extractSuperclass.ExtractSuperClassUtil
import com.intellij.refactoring.lang.ElementsHandler
import com.intellij.refactoring.util.CommonRefactoringUtil
import org.jetbrains.kotlin.idea.refactoring.SeparateFileWrapper
import org.jetbrains.kotlin.idea.refactoring.chooseContainerElementIfNecessary
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
@@ -42,6 +45,7 @@ abstract class KotlinExtractSuperHandlerBase(private val isExtractInterface: Boo
val offset = editor.caretModel.offset
val element = file.findElementAt(offset) ?: return
val klass = element.getNonStrictParentOfType<KtClassOrObject>() ?: return
if (!checkClass(klass, editor)) return
editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
selectElements(klass, project, editor)
}
@@ -50,9 +54,29 @@ abstract class KotlinExtractSuperHandlerBase(private val isExtractInterface: Boo
if (dataContext == null) return
val editor = CommonDataKeys.EDITOR.getData(dataContext)
val klass = PsiTreeUtil.findCommonParent(*elements)?.getNonStrictParentOfType<KtClassOrObject>() ?: return
if (!checkClass(klass, editor)) return
selectElements(klass, project, editor)
}
private fun checkClass(klass: KtClassOrObject, editor: Editor?): Boolean {
val project = klass.project
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, klass)) return false
getErrorMessage(klass)?.let {
CommonRefactoringUtil.showErrorHint(
project,
editor,
RefactoringBundle.getCannotRefactorMessage(it),
KotlinExtractSuperclassHandler.REFACTORING_NAME,
HelpID.EXTRACT_SUPERCLASS
)
return false
}
return true
}
fun selectElements(klass: KtClassOrObject, project: Project, editor: Editor?) {
val containers = klass.getExtractionContainers(strict = true, includeAll = true) + SeparateFileWrapper(klass.manager)
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/KotlinExtractSuperclassHandler.kt
-6
View File
@@ -39,12 +39,6 @@ object KotlinExtractSuperclassHandler : KotlinExtractSuperHandlerBase(false) {
}
override fun doInvoke(klass: KtClassOrObject, targetParent: PsiElement, project: Project, editor: Editor?) {
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, klass)) return
getErrorMessage(klass)?.let {
CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.getCannotRefactorMessage(it), REFACTORING_NAME, HelpID.EXTRACT_SUPERCLASS)
}
KotlinExtractSuperclassDialog(
originalClass = klass,
targetParent = targetParent,