Use ModalityState.any() for J2K post processing
#KT-17870 fixed
This commit is contained in:
@@ -17,7 +17,9 @@
|
|||||||
package org.jetbrains.kotlin.idea.core.util
|
package org.jetbrains.kotlin.idea.core.util
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.application.ModalityState
|
||||||
import kotlinx.coroutines.experimental.CoroutineDispatcher
|
import kotlinx.coroutines.experimental.CoroutineDispatcher
|
||||||
|
import kotlin.coroutines.experimental.AbstractCoroutineContextElement
|
||||||
import kotlin.coroutines.experimental.CoroutineContext
|
import kotlin.coroutines.experimental.CoroutineContext
|
||||||
|
|
||||||
|
|
||||||
@@ -27,6 +29,11 @@ public object EDT : CoroutineDispatcher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun dispatch(context: CoroutineContext, block: Runnable) {
|
override fun dispatch(context: CoroutineContext, block: Runnable) {
|
||||||
ApplicationManager.getApplication().invokeLater(block)
|
val modalityState = context[ModalityStateElement.Key]?.modalityState ?: ModalityState.defaultModalityState()
|
||||||
|
ApplicationManager.getApplication().invokeLater(block, modalityState)
|
||||||
|
}
|
||||||
|
|
||||||
|
class ModalityStateElement(val modalityState: ModalityState) : AbstractCoroutineContextElement(Key) {
|
||||||
|
companion object Key : CoroutineContext.Key<ModalityStateElement>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
package org.jetbrains.kotlin.idea.j2k
|
package org.jetbrains.kotlin.idea.j2k
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.application.ModalityState
|
||||||
import com.intellij.openapi.editor.RangeMarker
|
import com.intellij.openapi.editor.RangeMarker
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
@@ -55,7 +56,8 @@ class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
|
|||||||
PROCESS
|
PROCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?) = runBlocking {
|
override fun doAdditionalProcessing(file: KtFile, rangeMarker: RangeMarker?) =
|
||||||
|
runBlocking(EDT.ModalityStateElement(ModalityState.any())) {
|
||||||
do {
|
do {
|
||||||
var modificationStamp: Long? = file.modificationStamp
|
var modificationStamp: Long? = file.modificationStamp
|
||||||
val elementToActions = runReadAction {
|
val elementToActions = runReadAction {
|
||||||
|
|||||||
Reference in New Issue
Block a user