@@ -30,7 +30,6 @@ import com.intellij.openapi.diagnostic.debug
30
30
import com.intellij.openapi.diagnostic.logger
31
31
import com.intellij.openapi.diagnostic.trace
32
32
import com.intellij.openapi.progress.ProcessCanceledException
33
- import com.intellij.openapi.progress.blockingContext
34
33
import com.intellij.openapi.progress.checkCanceled
35
34
import com.intellij.openapi.project.Project
36
35
import com.intellij.openapi.util.registry.Registry
@@ -48,6 +47,7 @@ import kotlinx.coroutines.launch
48
47
import java.util.concurrent.ConcurrentHashMap
49
48
import java.util.concurrent.ConcurrentMap
50
49
import java.util.concurrent.atomic.AtomicLong
50
+ import kotlin.time.TimedValue
51
51
import kotlin.time.measureTimedValue
52
52
53
53
private const val BUILD_TIMEOUT_MS = 500L
@@ -201,16 +201,14 @@ class GraphQLSchemaProvider(private val project: Project, private val coroutineS
201
201
val registryInfo = getRegistryInfo(scope, modificationStamp)
202
202
val schemaInfo = try {
203
203
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)
214
212
}
215
213
LOG .info(" Schema was built in ${duration} (scope=${scope.scopeId} , stamp=$modificationStamp )" )
216
214
schema
@@ -249,13 +247,11 @@ class GraphQLSchemaProvider(private val project: Project, private val coroutineS
249
247
val (registry, duration) = measureTimedValue {
250
248
val documentsProcessor = smartReadAction(project) { processSchemaDocuments(scope) }
251
249
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)
258
253
}
254
+ GraphQLRegistryInfo (compositeRegistry.build(), documentsProcessor.isTooComplex)
259
255
}
260
256
LOG .info(" Registry was built in ${duration} (scope=${scope.scopeId} , stamp=$modificationStamp )" )
261
257
return registry
0 commit comments