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

Move adjustExtractionData.performAnalysis under modal progress

Browse Source 
Relates to #143709
This commit is contained in:
Vladimir Dolzhenko
2020-02-20 16:51:02 +01:00
parent ec431460b3
commit aab8555d65
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
+5 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine package org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine
import com.intellij.openapi.actionSystem.ex.ActionUtil
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -57,7 +58,10 @@ class ExtractionEngine(
) { ) {
val project = extractionData.project val project = extractionData.project
val analysisResult = helper.adjustExtractionData(extractionData).performAnalysis() val adjustExtractionData = helper.adjustExtractionData(extractionData)
val analysisResult = ActionUtil.underModalProgress(project, "Analyze extraction data...") {
adjustExtractionData.performAnalysis()
}
if (ApplicationManager.getApplication()!!.isUnitTestMode && analysisResult.status != AnalysisResult.Status.SUCCESS) { if (ApplicationManager.getApplication()!!.isUnitTestMode && analysisResult.status != AnalysisResult.Status.SUCCESS) {
throw BaseRefactoringProcessor.ConflictsInTestsException(analysisResult.messages.map { it.renderMessage() }) throw BaseRefactoringProcessor.ConflictsInTestsException(analysisResult.messages.map { it.renderMessage() })