Skip to content

Commit 3e1a100

Browse files
knishtintellij-monorepo-bot
authored andcommitted
[threading] IJPL-190260: Remove blockingContext JetBrains#5
GitOrigin-RevId: 832068acd166721e0c31729f570addb08975122a
1 parent c43846a commit 3e1a100

File tree

2 files changed

+16
-23
lines changed

2 files changed

+16
-23
lines changed

src/main/com/intellij/lang/jsgraphql/ide/introspection/GraphQLIntrospectionQueryExecutor.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import com.intellij.openapi.diagnostic.debug
1616
import com.intellij.openapi.diagnostic.getOrLogException
1717
import com.intellij.openapi.diagnostic.logger
1818
import com.intellij.openapi.options.advanced.AdvancedSettings
19-
import com.intellij.openapi.progress.blockingContext
2019
import com.intellij.openapi.project.Project
2120
import com.intellij.openapi.util.io.FileUtil
2221
import com.intellij.openapi.util.registry.Registry
@@ -62,9 +61,9 @@ class GraphQLIntrospectionQueryExecutor(private val project: Project, private va
6261
val queryRunner = GraphQLQueryClient.getInstance(project)
6362
queryRunner.sendRequest(endpoint, prepareQueryPayload(introspectionQuery), retry)
6463
} ?: return@withBackgroundProgress
65-
val parsedIntrospection = blockingContext {
64+
val parsedIntrospection =
6665
GraphQLIntrospectionService.parseIntrospectionOutput(project, endpoint, schemaPath, rawIntrospectionResponse)
67-
} ?: return@withBackgroundProgress
66+
?: return@withBackgroundProgress
6867
createIntrospectionOutput(schemaPath, parsedIntrospection, endpoint, rawIntrospectionResponse)
6968
}
7069
}
@@ -114,9 +113,7 @@ class GraphQLIntrospectionQueryExecutor(private val project: Project, private va
114113
}
115114

116115
withContext(Dispatchers.EDT) {
117-
blockingContext {
118-
GraphQLIntrospectionService.createOrUpdateIntrospectionOutputFile(project, parsedIntrospection, filePath.name, dir)
119-
}
116+
GraphQLIntrospectionService.createOrUpdateIntrospectionOutputFile(project, parsedIntrospection, filePath.name, dir)
120117
}
121118
}
122119
catch (exception: CancellationException) {

src/main/com/intellij/lang/jsgraphql/schema/GraphQLSchemaProvider.kt

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import com.intellij.openapi.diagnostic.debug
3030
import com.intellij.openapi.diagnostic.logger
3131
import com.intellij.openapi.diagnostic.trace
3232
import com.intellij.openapi.progress.ProcessCanceledException
33-
import com.intellij.openapi.progress.blockingContext
3433
import com.intellij.openapi.progress.checkCanceled
3534
import com.intellij.openapi.project.Project
3635
import com.intellij.openapi.util.registry.Registry
@@ -48,6 +47,7 @@ import kotlinx.coroutines.launch
4847
import java.util.concurrent.ConcurrentHashMap
4948
import java.util.concurrent.ConcurrentMap
5049
import java.util.concurrent.atomic.AtomicLong
50+
import kotlin.time.TimedValue
5151
import kotlin.time.measureTimedValue
5252

5353
private 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

Comments
 (0)