Code cleanup GraphQLConfigManager

Author: vepanimas

resources/messages/GraphQLMessages.properties

@@ -12,6 +12,10 @@ graphql.notification.unable.to.create.file=Unable to create file '{0}' in direct
 graphql.notification.invalid.config.file=Invalid config file
 graphql.notification.empty.schema.path=Please set a non-empty `schemaPath` field in the config file.
 graphql.notification.empty.endpoint.url=Please set a non-empty endpoint `url` field in the config file.
+graphql.notification.unable.to.parse.file=Unable to parse {0}
+graphql.notification.load.schema.from.endpoint.title=Get GraphQL schema from endpoint now?
+graphql.notification.load.schema.from.endpoint.body=Introspect '{0}' to update the local schema file.
+graphql.notification.load.schema.from.endpoint.action=Introspect '{0}'
 
 # Introspection
 graphql.introspection.missing.data=Expected `data` key to be present in query result.
@@ -20,6 +24,7 @@ graphql.introspection.errors=Introspection query returned errors: {0}
 
 # Progress
 graphql.progress.executing.introspection.query=Executing GraphQL introspection query
+graphql.progress.configuration.scan=GraphQL configuration scan
 
 # Editor
 graphql.line.marker.generate.schema.file=Generate GraphQL SDL schema file

src/main/com/intellij/lang/jsgraphql/GraphQLFileType.java

@@ -56,7 +56,7 @@ public Icon getIcon() {
      *
      * @return true if the scratch file contains a GraphQL PsiFile
      */
-    public static boolean isGraphQLScratchFile(Project project, VirtualFile file) {
+    public static boolean isGraphQLScratchFile(@NotNull Project project, @NotNull VirtualFile file) {
         if (ScratchUtil.isScratch(file)) {
             final PsiManager psiManager = PsiManager.getInstance(project);
             try {
@@ -71,4 +71,12 @@ public static boolean isGraphQLScratchFile(Project project, VirtualFile file) {
         return false;
     }
 
+    public static boolean isGraphQLFile(@NotNull Project project, @Nullable VirtualFile virtualFile) {
+        if (virtualFile == null) {
+            return false;
+        }
+
+        return virtualFile.getFileType() == GraphQLFileType.INSTANCE || GraphQLFileType.isGraphQLScratchFile(project, virtualFile);
+    }
+
 }

src/main/com/intellij/lang/jsgraphql/ide/actions/GraphQLEditConfigAction.java

@@ -70,7 +70,7 @@ public void actionPerformed(AnActionEvent e) {
                 // no config associated, ask to create one
                 String message = "Searched current and parent directories.<br><a href=\"create\">Create .graphqlconfig file</a>";
                 Notifications.Bus.notify(new Notification("GraphQL", "No .graphqlconfig file found", message, NotificationType.INFORMATION, (notification, event) -> {
-                    final Set<VirtualFile> contentRoots = Optional.ofNullable(configManager.getContentRoots(virtualFile)).orElse(Collections.emptySet());
+                    final Set<VirtualFile> contentRoots = configManager.getContentRoots(virtualFile);
                     VirtualFile directory = virtualFile.getParent();
                     assert directory != null;
                     final List<VirtualFile> configDirectoryCandidates = Lists.newArrayList(directory);

src/main/com/intellij/lang/jsgraphql/ide/project/GraphQLPsiSearchHelper.java

@@ -28,6 +28,7 @@
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.PluginDescriptor;
@@ -62,7 +63,7 @@
 /**
  * Enables cross-file searches for PSI references
  */
-public class GraphQLPsiSearchHelper {
+public class GraphQLPsiSearchHelper implements Disposable {
 
     private static final Key<PsiFile> GRAPHQL_BUILT_IN_SCHEMA_PSI_FILE = Key.create("JSGraphQL.built-in.schema.psi-file");
     private static final Key<PsiFile> RELAY_MODERN_DIRECTIVES_SCHEMA_PSI_FILE = Key.create("JSGraphQL.relay.modern.directives.schema.psi-file");
@@ -72,7 +73,7 @@ public class GraphQLPsiSearchHelper {
     private final Project myProject;
     private final Map<String, GlobalSearchScope> fileNameToSchemaScope = Maps.newConcurrentMap();
     private final PluginDescriptor pluginDescriptor;
-    private final GlobalSearchScope myGlobalSearchScope;
+    private final GlobalSearchScope myGlobalScope;
     private final GlobalSearchScope allBuiltInSchemaScopes;
     private final GraphQLConfigManager graphQLConfigManager;
 
@@ -106,8 +107,11 @@ public GraphQLPsiSearchHelper(@NotNull final Project project) {
             .union(defaultProjectFileScope);
 
         final FileType[] searchScopeFileTypes = GraphQLFindUsagesUtil.getService().getIncludedFileTypes().toArray(FileType.EMPTY_ARRAY);
-        myGlobalSearchScope = GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope(myProject), searchScopeFileTypes).union(allBuiltInSchemaScopes);
-        project.getMessageBus().connect().subscribe(PsiManagerImpl.ANY_PSI_CHANGE_TOPIC, new AnyPsiChangeListener() {
+        myGlobalScope = GlobalSearchScope
+            .getScopeRestrictedByFileTypes(GlobalSearchScope.projectScope(myProject), searchScopeFileTypes)
+            .union(allBuiltInSchemaScopes);
+
+        project.getMessageBus().connect(this).subscribe(PsiManagerImpl.ANY_PSI_CHANGE_TOPIC, new AnyPsiChangeListener() {
             @Override
             public void beforePsiChanged(boolean isPhysical) {
                 // clear the cache on each PSI change
@@ -135,11 +139,11 @@ public GlobalSearchScope getSchemaScope(@NotNull PsiElement element) {
             final NamedScope schemaScope = graphQLConfigManager.getSchemaScope(virtualFile);
             if (schemaScope != null) {
                 final GlobalSearchScope filterSearchScope = GlobalSearchScopesCore.filterScope(myProject, schemaScope);
-                return myGlobalSearchScope.intersectWith(filterSearchScope.union(allBuiltInSchemaScopes));
+                return myGlobalScope.intersectWith(filterSearchScope.union(allBuiltInSchemaScopes));
             }
 
             // default is entire project limited by relevant file types
-            return myGlobalSearchScope;
+            return myGlobalScope;
         });
     }
 
@@ -152,7 +156,7 @@ public GlobalSearchScope getUseScope(@NotNull PsiElement element) {
         if (element.getContainingFile().getVirtualFile() != null) {
             return getSchemaScope(element);
         } else {
-            return myGlobalSearchScope;
+            return myGlobalScope;
         }
     }
 
@@ -424,4 +428,8 @@ public void processAdditionalBuiltInPsiFiles(@NotNull GlobalSearchScope schemaSc
             consumer.accept(relayModernDirectivesSchema);
         }
     }
+
+    @Override
+    public void dispose() {
+    }
 }