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

Generate test support: ask everything before write action to avoid AWT events inside

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-01-31 20:54:01 +03:00
parent 70c5d8b9ad
commit 9664a066a4
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+18 -17
View File
@@ -149,33 +149,34 @@ abstract class KotlinGenerateTestSupportActionBase(
private fun doGenerate(editor: Editor, file: PsiFile, klass: KtClassOrObject, framework: TestFramework) { private fun doGenerate(editor: Editor, file: PsiFile, klass: KtClassOrObject, framework: TestFramework) {
val project = file.project val project = file.project
val commandName = "Generate test function" val commandName = "Generate test function"
val fileTemplateDescriptor = methodKind.getFileTemplateDescriptor(framework)
val fileTemplate = FileTemplateManager.getInstance(project).getCodeTemplate(fileTemplateDescriptor.fileName)
var templateText = fileTemplate.text.replace(BODY_VAR, "")
var name: String? = null
if (templateText.contains(NAME_VAR)) {
name = if (templateText.contains("test$NAME_VAR")) "Name" else "name"
if (!ApplicationManager.getApplication().isUnitTestMode) {
name = Messages.showInputDialog("Choose test name: ", commandName, null, name, NAME_VALIDATOR)
?: return
}
templateText = fileTemplate.text.replace(NAME_VAR, DUMMY_NAME)
}
project.executeWriteCommand(commandName) { project.executeWriteCommand(commandName) {
try { try {
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
val fileTemplateDescriptor = methodKind.getFileTemplateDescriptor(framework)
val fileTemplate = FileTemplateManager.getInstance(project).getCodeTemplate(fileTemplateDescriptor.fileName)
var templateText = fileTemplate.text.replace(BODY_VAR, "")
var name: String? = null
if (templateText.contains(NAME_VAR)) {
name = if (templateText.contains("test$NAME_VAR")) "Name" else "name"
if (!ApplicationManager.getApplication().isUnitTestMode) {
name = Messages.showInputDialog("Choose test name: ", commandName, null, name, NAME_VALIDATOR)
?: return@executeWriteCommand
}
templateText = fileTemplate.text.replace(NAME_VAR, DUMMY_NAME)
}
val factory = PsiElementFactory.SERVICE.getInstance(project) val factory = PsiElementFactory.SERVICE.getInstance(project)
val psiMethod = factory.createMethodFromText(templateText, null) val psiMethod = factory.createMethodFromText(templateText, null)
psiMethod.throwsList.referenceElements.forEach { it.delete() } psiMethod.throwsList.referenceElements.forEach { it.delete() }
var function = psiMethod.j2k() as? KtNamedFunction var function = psiMethod.j2k() as? KtNamedFunction ?: run {
if (function == null) {
HintManager.getInstance().showErrorHint(editor, "Couldn't convert Java template to Kotlin") HintManager.getInstance().showErrorHint(editor, "Couldn't convert Java template to Kotlin")
return@executeWriteCommand return@executeWriteCommand
} }
if (name != null) { name?.let {
function = substituteNewName(function, name) function = substituteNewName(function, it)
} }
val functionInPlace = insertMember(editor, klass, function) val functionInPlace = insertMember(editor, klass, function)