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

Execute action without writeActionPriority in tests

Browse Source
This commit is contained in:
Nikolay Krasko
2017-09-19 11:23:11 +03:00
parent c05c359703
commit 1b447a0231
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/ProgressUtil.kt
+8 -4
View File
@@ -41,16 +41,20 @@ fun <T : Any> runInReadActionWithWriteActionPriorityWithPCE(f: () -> T): T {
fun <T : Any> runInReadActionWithWriteActionPriority(f: () -> T): T? { fun <T : Any> runInReadActionWithWriteActionPriority(f: () -> T): T? {
var r: T? = null var r: T? = null
val complete = ProgressIndicatorUtils.runInReadActionWithWriteActionPriority { if (!with(ApplicationManager.getApplication()) { isDispatchThread && isUnitTestMode }) {
val complete = ProgressIndicatorUtils.runInReadActionWithWriteActionPriority {
r = f()
}
if (!complete) return null
}
else {
r = f() r = f()
} }
if (!complete) return null
return r return r
} }
fun <T : Any> Project.runSynchronouslyWithProgress(progressTitle: String, canBeCanceled: Boolean, action: () -> T): T? { fun <T : Any> Project.runSynchronouslyWithProgress(progressTitle: String, canBeCanceled: Boolean, action: () -> T): T? {
var result: T? = null var result: T? = null
ProgressManager.getInstance().runProcessWithProgressSynchronously({ result = action() }, progressTitle, canBeCanceled, this) ProgressManager.getInstance().runProcessWithProgressSynchronously({ result = action() }, progressTitle, canBeCanceled, this)