MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin extract method] KTIJ-21622: restart on invalid method name

Browse Source 
GitOrigin-RevId: 4fad1f73236f1a4425162c949872076c25a2ab31
This commit is contained in:
Alexandr Suhinin
2022-04-26 04:59:42 +00:00
committed by intellij-monorepo-bot
parent 2b9d34dcb4
commit a9fc45aed4
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceMethodExtractor.kt
+3 -3
View File
@@ -81,7 +81,7 @@ private fun installGotItTooltips(editor: Editor, navigationGotItRange: TextRange
editor.caretModel.addCaretListener(caretListener, disposable)
}
class ExtractMethodTemplate(private val editor: Editor, private val method: PsiNamedElement, private val call: PsiElement)
class ExtractMethodTemplate(private val editor: Editor, private val commandName: @Nls String, private val method: PsiNamedElement, private val call: PsiElement)
: InplaceRefactoring(editor, method, method.project) {
init {
@@ -116,7 +116,7 @@ class ExtractMethodTemplate(private val editor: Editor, private val method: PsiN
override fun shouldSelectAll(): Boolean = false
override fun getCommandName(): String = ExtractMethodHandler.getRefactoringName()
override fun getCommandName(): String = commandName
}
@@ -170,7 +170,7 @@ class InplaceMethodExtractor(private val editor: Editor,
callIdentifier.textRange.endOffset)
Disposer.register(disposable, codePreview)
val templateState = ExtractMethodTemplate(editor, method, callIdentifier).runTemplate(suggestedNames)
val templateState = ExtractMethodTemplate(editor, ExtractMethodHandler.getRefactoringName(), method, callIdentifier).runTemplate(suggestedNames)
afterTemplateStart(templateState)
} catch (e: Throwable) {
Disposer.dispose(disposable)
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt
+27 -4
View File
@@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction
import com.intellij.codeInsight.template.Template
import com.intellij.codeInsight.template.TemplateEditingAdapter
import com.intellij.codeInsight.template.impl.TemplateManagerImpl
import com.intellij.java.refactoring.JavaRefactoringBundle
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable
@@ -21,18 +22,21 @@ import com.intellij.refactoring.extractMethod.newImpl.inplace.ExtractMethodTempl
import com.intellij.refactoring.extractMethod.newImpl.inplace.InplaceExtractUtils
import org.jetbrains.annotations.Nls
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.base.psi.unifier.toRange
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.util.CodeInsightUtils
import org.jetbrains.kotlin.idea.core.util.range
import org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator
import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.refactoring.introduce.selectElementsWithTargetSibling
import org.jetbrains.kotlin.idea.refactoring.introduce.validateExpressionElements
import org.jetbrains.kotlin.idea.util.nonBlocking
import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
import org.jetbrains.kotlin.psi.KtBlockExpression
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
class ExtractKotlinFunctionHandler(
@@ -95,8 +99,7 @@ class ExtractKotlinFunctionHandler(
val methodOffset = extraction.declaration.navigationElement.textRange.endOffset
val callOffset = callIdentifier.textRange.endOffset
val preview = InplaceExtractUtils.createPreview(editor, methodRange, methodOffset, callRange.range!!, callOffset)
val templateState = ExtractMethodTemplate(editor, extraction.declaration, callIdentifier).runTemplate(LinkedHashSet())
callRange.dispose()
val templateState = ExtractMethodTemplate(editor, EXTRACT_FUNCTION, extraction.declaration, callIdentifier).runTemplate(LinkedHashSet())
Disposer.register(templateState, preview)
templateState.addTemplateStateListener(object: TemplateEditingAdapter() {
override fun templateFinished(template: Template, brokenOff: Boolean) {
@@ -106,7 +109,17 @@ class ExtractKotlinFunctionHandler(
}
})
InplaceExtractUtils.addTemplateFinishedListener(templateState) {
processDuplicates(extraction.duplicateReplacers, file.project, editor)
val call = findSingleCallExpression(file, callRange.range)
val errorMessage = getIdentifierError(it!!, call)
if (errorMessage != null) {
editorState.revert()
ExtractKotlinFunctionHandler(allContainersEnabled, InplaceExtractionHelper(allContainersEnabled))
.invoke(project, editor, descriptorWithConflicts.descriptor.extractionData.originalFile, null)
//CommonRefactoringUtil.showErrorHint(project, editor, errorMessage, EXTRACT_FUNCTION, null)
} else {
Disposer.dispose(preview)
processDuplicates(extraction.duplicateReplacers, file.project, editor)
}
}
onFinish(extraction)
}
@@ -114,6 +127,16 @@ class ExtractKotlinFunctionHandler(
doRefactor(configuration, ::afterFinish)
}
private fun getIdentifierError(methodName: String, call: KtCallExpression?): String? {
return if (! KotlinNamesValidator().isIdentifier(methodName, null)) {
JavaRefactoringBundle.message("extract.method.error.invalid.name")
} else if (call?.getResolvedCall(call.analyze())?.resultingDescriptor == null) {
JavaRefactoringBundle.message("extract.method.error.method.conflict")
} else {
null
}
}
private fun findSingleCallExpression(file: KtFile, range: TextRange?): KtCallExpression? {
if (range == null) return null
val container = PsiTreeUtil.findCommonParent(file.findElementAt(range.startOffset), file.findElementAt(range.endOffset))