From aab8555d65337165dc1d00612287017ded486cf5 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Thu, 20 Feb 2020 16:51:02 +0100 Subject: [PATCH] Move adjustExtractionData.performAnalysis under modal progress Relates to #143709 --- .../introduce/extractionEngine/ExtractionEngine.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt index 52e0511af97..110baf30b37 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt @@ -16,6 +16,7 @@ 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.editor.Editor import com.intellij.openapi.project.Project @@ -57,7 +58,10 @@ class ExtractionEngine( ) { 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) { throw BaseRefactoringProcessor.ConflictsInTestsException(analysisResult.messages.map { it.renderMessage() })