Remove warn on performing analysis from dispatch thread
This is outdated since lazy resolve can be called from dispatch thread (Intentions do it)
This commit is contained in:
@@ -61,7 +61,6 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext
|
|||||||
import org.jetbrains.jet.lang.types.TypeUtils
|
import org.jetbrains.jet.lang.types.TypeUtils
|
||||||
import org.jetbrains.jet.lang.resolve.scopes.ChainedScope
|
import org.jetbrains.jet.lang.resolve.scopes.ChainedScope
|
||||||
import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
|
import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
|
||||||
import org.jetbrains.jet.plugin.util.application.warnTimeConsuming
|
|
||||||
|
|
||||||
public trait CacheExtension<T> {
|
public trait CacheExtension<T> {
|
||||||
public val platform: TargetPlatform
|
public val platform: TargetPlatform
|
||||||
@@ -169,8 +168,6 @@ private class PerFileAnalysisCache(val file: JetFile, val resolveSession: Resolv
|
|||||||
return AnalyzeExhaust.EMPTY
|
return AnalyzeExhaust.EMPTY
|
||||||
}
|
}
|
||||||
|
|
||||||
warnTimeConsuming(LOG)
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return KotlinResolveDataProvider.analyze(project, resolveSession, analyzableElement)
|
return KotlinResolveDataProvider.analyze(project, resolveSession, analyzableElement)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,25 +17,9 @@
|
|||||||
package org.jetbrains.jet.plugin.util.application
|
package org.jetbrains.jet.plugin.util.application
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.util.ShutDownTracker
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.command.CommandProcessor
|
import com.intellij.openapi.command.CommandProcessor
|
||||||
|
|
||||||
public fun warnTimeConsuming(logger: Logger) {
|
|
||||||
val application = ApplicationManager.getApplication()!!
|
|
||||||
if (application.isUnitTestMode() || application.isHeadlessEnvironment() || ShutDownTracker.isShutdownHookRunning()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!application.isDispatchThread()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.warn("This operation is time consuming and must not be called on EDT.")
|
|
||||||
java.lang.Throwable().printStackTrace()
|
|
||||||
}
|
|
||||||
|
|
||||||
public fun runReadAction<T: Any>(action: () -> T?): T? {
|
public fun runReadAction<T: Any>(action: () -> T?): T? {
|
||||||
return ApplicationManager.getApplication()?.runReadAction<T>(action)
|
return ApplicationManager.getApplication()?.runReadAction<T>(action)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user