From d9faaddccab70dd7f0834ee3e1a3da313250bf68 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 16 Oct 2019 14:06:22 +0700 Subject: [PATCH] delayedRequestsWaitingSet: `performDelayedRefactoringRequests` should commit all documents before refactoring #KT-34365 Fixed --- .../idea/codeInsight/shorten/delayedRequestsWaitingSet.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/delayedRequestsWaitingSet.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/delayedRequestsWaitingSet.kt index e10528a948e..4e95634afea 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/delayedRequestsWaitingSet.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/delayedRequestsWaitingSet.kt @@ -20,10 +20,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project import com.intellij.openapi.util.Key -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMember -import com.intellij.psi.SmartPointerManager -import com.intellij.psi.SmartPsiElementPointer +import com.intellij.psi.* import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor @@ -90,6 +87,7 @@ fun addDelayedImportRequest(elementToImport: PsiElement, file: KtFile) { fun performDelayedRefactoringRequests(project: Project) { project.delayedRefactoringRequests?.let { requests -> project.delayedRefactoringRequests = null + PsiDocumentManager.getInstance(project).commitAllDocuments() val shorteningRequests = ArrayList() val importRequests = ArrayList()