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

J2K: do not run runUndoTransparentAction outside EDT

Browse Source 
#KT-39739 fixed
This commit is contained in:
Ilya Kirillov
2020-07-16 21:05:24 +03:00
parent d16f246375
commit dccac34282
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/ActionRunningMode.kt
+4 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.util package org.jetbrains.kotlin.idea.util
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.command.CommandProcessor
enum class ActionRunningMode { enum class ActionRunningMode {
RUN_IN_CURRENT_THREAD, RUN_IN_CURRENT_THREAD,
@@ -19,7 +20,9 @@ inline fun <T> ActionRunningMode.runAction(crossinline action: () -> T): T = whe
ActionRunningMode.RUN_IN_EDT -> { ActionRunningMode.RUN_IN_EDT -> {
var result: T? = null var result: T? = null
ApplicationManager.getApplication().invokeAndWait { ApplicationManager.getApplication().invokeAndWait {
result = ApplicationManager.getApplication().runWriteAction<T> { action() } CommandProcessor.getInstance().runUndoTransparentAction {
result = ApplicationManager.getApplication().runWriteAction<T> { action() }
}
} }
result!! result!!
} }
nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ShortenReferenceProcessing.kt
+11 -13
View File
@@ -28,20 +28,18 @@ class ShortenReferenceProcessing : FileBasedPostProcessing() {
} }
override fun runProcessing(file: KtFile, allFiles: List<KtFile>, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) { override fun runProcessing(file: KtFile, allFiles: List<KtFile>, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) {
CommandProcessor.getInstance().runUndoTransparentAction { if (rangeMarker != null) {
if (rangeMarker != null) { if (rangeMarker.isValid) {
if (rangeMarker.isValid) { ShortenReferences.DEFAULT.process(
ShortenReferences.DEFAULT.process( file,
file, rangeMarker.startOffset,
rangeMarker.startOffset, rangeMarker.endOffset,
rangeMarker.endOffset, filter,
filter, actionRunningMode = ActionRunningMode.RUN_IN_EDT
actionRunningMode = ActionRunningMode.RUN_IN_EDT )
)
}
} else {
ShortenReferences.DEFAULT.process(file, filter, actionRunningMode = ActionRunningMode.RUN_IN_EDT)
} }
} else {
ShortenReferences.DEFAULT.process(file, filter, actionRunningMode = ActionRunningMode.RUN_IN_EDT)
} }
} }
} }