Prevent caching an empty schema because of PCE

Author: vepanimas

src/main/com/intellij/lang/jsgraphql/ide/editor/GraphQLIntrospectionService.java

@@ -31,12 +31,12 @@
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.editor.EditorBundle;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.fileTypes.PlainTextLanguage;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -474,6 +474,8 @@ public void run(@NotNull ProgressIndicator indicator) {
                 // always try to print the schema to validate it since that will be done in schema discovery of the JSON anyway
                 final String schemaAsSDL = printIntrospectionAsGraphQL(introspection);
                 schemaText = format == IntrospectionOutputFormat.SDL ? schemaAsSDL : responseJson;
+            } catch (ProcessCanceledException exception) {
+                throw exception;
             } catch (Exception exception) {
                 handleIntrospectionError(exception, null, responseJson);
                 return;
@@ -482,6 +484,8 @@ public void run(@NotNull ProgressIndicator indicator) {
             ApplicationManager.getApplication().invokeLater(() -> {
                 try {
                     createOrUpdateIntrospectionOutputFile(schemaText, format, introspectionSourceFile, schemaPath);
+                } catch (ProcessCanceledException exception) {
+                    throw exception;
                 } catch (Exception e) {
                     handleIntrospectionError(e, null, responseJson);
                 }

src/main/com/intellij/lang/jsgraphql/schema/GraphQLRegistryProvider.java

@@ -26,6 +26,7 @@
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.TextRange;
@@ -181,6 +182,8 @@ private GraphQLValidatedTypeDefinitionRegistry getRegistry(@NotNull PsiElement s
                                     processFile.accept(newIntrospectionFile);
                                 }
                             }
+                        } catch (ProcessCanceledException e) {
+                            throw e;
                         } catch (Exception e) {
                             final List<SourceLocation> sourceLocation = Collections.singletonList(new SourceLocation(1, 1, GraphQLPsiUtil.getFileName(psiFile)));
                             errors.add(new SchemaProblem(Collections.singletonList(new InvalidSyntaxError(sourceLocation, e.getMessage()))));

src/main/com/intellij/lang/jsgraphql/schema/GraphQLSchemaProviderImpl.java

@@ -12,19 +12,16 @@
 import com.intellij.lang.jsgraphql.psi.GraphQLPsiUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import graphql.Directives;
 import graphql.GraphQLException;
-import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 import graphql.schema.idl.TypeDefinitionRegistry;
 import graphql.schema.idl.UnExecutableSchemaGenerator;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.reflect.Field;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
@@ -73,6 +70,8 @@ public GraphQLValidatedSchema getValidatedSchema(@NotNull PsiElement psiElement)
             try {
                 final GraphQLSchema schema = UnExecutableSchemaGenerator.makeUnExecutableSchema(registryWithErrors.getRegistry());
                 return new GraphQLValidatedSchema(schema, Collections.emptyList(), registryWithErrors);
+            } catch (ProcessCanceledException e) {
+                throw e;
             } catch (GraphQLException e) {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Schema build error:", e);
@@ -93,6 +92,8 @@ public GraphQLSchema getTolerantSchema(@NotNull PsiElement psiElement) {
         return fileNameToTolerantSchema.computeIfAbsent(GraphQLPsiUtil.getFileName(psiElement.getContainingFile()), fileName -> {
             try {
                 return UnExecutableSchemaGenerator.makeUnExecutableSchema(getTolerantRegistry(psiElement));
+            } catch (ProcessCanceledException e) {
+                throw e;
             } catch (Exception e) {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Schema build error:", e);