@@ -30,7 +30,6 @@ import com.intellij.openapi.diagnostic.debug
3030import com.intellij.openapi.diagnostic.logger
3131import com.intellij.openapi.diagnostic.trace
3232import com.intellij.openapi.progress.ProcessCanceledException
33- import com.intellij.openapi.progress.blockingContext
3433import com.intellij.openapi.progress.checkCanceled
3534import com.intellij.openapi.project.Project
3635import com.intellij.openapi.util.registry.Registry
@@ -48,6 +47,7 @@ import kotlinx.coroutines.launch
4847import java.util.concurrent.ConcurrentHashMap
4948import java.util.concurrent.ConcurrentMap
5049import java.util.concurrent.atomic.AtomicLong
50+ import kotlin.time.TimedValue
5151import kotlin.time.measureTimedValue
5252
5353private const val BUILD_TIMEOUT_MS = 500L
@@ -201,16 +201,14 @@ class GraphQLSchemaProvider(private val project: Project, private val coroutineS
201201 val registryInfo = getRegistryInfo(scope, modificationStamp)
202202 val schemaInfo = try {
203203 LOG .debug { " Schema build started (scope=${scope.scopeId} , stamp=$modificationStamp )" }
204- val (schema, duration) = blockingContext {
205- measureTimedValue {
206- val schema = UnExecutableSchemaGenerator .makeUnExecutableSchema(registryInfo.typeDefinitionRegistry)
207- val validationErrors = SchemaValidator ().validateSchema(schema)
208- val errors = if (validationErrors.isEmpty())
209- emptyList()
210- else
211- listOf<GraphQLException >(InvalidSchemaException (validationErrors))
212- GraphQLSchemaInfo (schema, errors, registryInfo)
213- }
204+ val (schema, duration) = measureTimedValue {
205+ val schema = UnExecutableSchemaGenerator .makeUnExecutableSchema(registryInfo.typeDefinitionRegistry)
206+ val validationErrors = SchemaValidator ().validateSchema(schema)
207+ val errors = if (validationErrors.isEmpty())
208+ emptyList()
209+ else
210+ listOf<GraphQLException >(InvalidSchemaException (validationErrors))
211+ GraphQLSchemaInfo (schema, errors, registryInfo)
214212 }
215213 LOG .info(" Schema was built in ${duration} (scope=${scope.scopeId} , stamp=$modificationStamp )" )
216214 schema
@@ -249,13 +247,11 @@ class GraphQLSchemaProvider(private val project: Project, private val coroutineS
249247 val (registry, duration) = measureTimedValue {
250248 val documentsProcessor = smartReadAction(project) { processSchemaDocuments(scope) }
251249
252- blockingContext {
253- val compositeRegistry = GraphQLCompositeRegistry ()
254- documentsProcessor.documents.forEach {
255- compositeRegistry.addFromDocument(it)
256- }
257- GraphQLRegistryInfo (compositeRegistry.build(), documentsProcessor.isTooComplex)
250+ val compositeRegistry = GraphQLCompositeRegistry ()
251+ documentsProcessor.documents.forEach {
252+ compositeRegistry.addFromDocument(it)
258253 }
254+ GraphQLRegistryInfo (compositeRegistry.build(), documentsProcessor.isTooComplex)
259255 }
260256 LOG .info(" Registry was built in ${duration} (scope=${scope.scopeId} , stamp=$modificationStamp )" )
261257 return registry
0 commit comments