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

Wrap Kotlin exception filter call to read action (EA-116446)

Browse Source 
See IDEA-186950 for details.
This commit is contained in:
Nikolay Krasko
2018-02-20 15:08:23 +03:00
parent 5901c2163f
commit d1eabb3e67
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.kt
+5 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.FilenameIndex import com.intellij.psi.search.FilenameIndex
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.idea.debugger.* import org.jetbrains.kotlin.idea.debugger.*
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import java.util.* import java.util.*
import java.util.regex.Pattern import java.util.regex.Pattern
@@ -31,8 +32,10 @@ class KotlinExceptionFilter(private val searchScope: GlobalSearchScope) : Filter
private val exceptionFilter = ExceptionFilter(searchScope) private val exceptionFilter = ExceptionFilter(searchScope)
override fun applyFilter(line: String, entireLength: Int): Filter.Result? { override fun applyFilter(line: String, entireLength: Int): Filter.Result? {
val result = exceptionFilter.applyFilter(line, entireLength) return runReadAction {
return if (result == null) null else patchResult(result, line) val result = exceptionFilter.applyFilter(line, entireLength)
if (result == null) null else patchResult(result, line)
}
} }
private fun patchResult(result: Filter.Result, line: String): Filter.Result { private fun patchResult(result: Filter.Result, line: String): Filter.Result {