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

delayedRequestsWaitingSet: performDelayedRefactoringRequests should commit all documents before refactoring

Browse Source 
#KT-34365 Fixed
This commit is contained in:
Dmitry Gridin
2019-10-16 14:06:22 +07:00
parent 72eee17bff
commit d9faaddcca
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/delayedRequestsWaitingSet.kt
+2 -4
View File
@@ -20,10 +20,7 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import com.intellij.psi.PsiElement import com.intellij.psi.*
import com.intellij.psi.PsiMember
import com.intellij.psi.SmartPointerManager
import com.intellij.psi.SmartPsiElementPointer
import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor
@@ -90,6 +87,7 @@ fun addDelayedImportRequest(elementToImport: PsiElement, file: KtFile) {
fun performDelayedRefactoringRequests(project: Project) { fun performDelayedRefactoringRequests(project: Project) {
project.delayedRefactoringRequests?.let { requests -> project.delayedRefactoringRequests?.let { requests ->
project.delayedRefactoringRequests = null project.delayedRefactoringRequests = null
PsiDocumentManager.getInstance(project).commitAllDocuments()
val shorteningRequests = ArrayList<ShorteningRequest>() val shorteningRequests = ArrayList<ShorteningRequest>()
val importRequests = ArrayList<ImportRequest>() val importRequests = ArrayList<ImportRequest>()