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

Added missed runReadAction to access psi on bg thread

Browse Source 
Relates to #KT-24122
This commit is contained in:
Vladimir Dolzhenko
2020-02-08 15:06:51 +01:00
parent ce2d32620a
commit 5b48f63bb9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinOptimizeImportsRefactoringHelper.kt
+6 -3
View File
@@ -31,6 +31,7 @@ import com.intellij.usageView.UsageInfo
import com.intellij.util.IncorrectOperationException import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection import org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtImportDirective import org.jetbrains.kotlin.psi.KtImportDirective
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
@@ -72,9 +73,11 @@ class KotlinOptimizeImportsRefactoringHelper : RefactoringHelper<Set<KtFile>> {
for ((counter, pointer) in pointers.withIndex()) { for ((counter, pointer) in pointers.withIndex()) {
indicator.fraction = counter.toDouble() / myTotal indicator.fraction = counter.toDouble() / myTotal
val directive = pointer.element runReadAction {
if (directive?.isValid == true) { val element = pointer.element
val presentableUrl = directive.containingFile.virtualFile.presentableUrl if (element?.isValid == true) element!! else null
}?.let { directive ->
val presentableUrl = runReadAction { directive.containingFile }.virtualFile.presentableUrl
indicator.text2 = presentableUrl indicator.text2 = presentableUrl
ApplicationManager.getApplication().invokeAndWait { ApplicationManager.getApplication().invokeAndWait {
project.executeWriteCommand("delete $presentableUrl") { project.executeWriteCommand("delete $presentableUrl") {