Merge pull request #379 from jimkyndemeyer/config-services-cleanup

Config services cleanup

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/completion/GraphQLCompletionContributor.java

@@ -491,7 +491,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
                 if (directiveLocations != null) {
                     final Set<String> currentLocations = Sets.newHashSet();
                     directiveLocations.getDirectiveLocationList().forEach(location -> currentLocations.add(location.getText()));
-                    final PsiFile builtInSchema = GraphQLPsiSearchHelper.getService(completionElement.getProject()).getBuiltInSchema();
+                    final PsiFile builtInSchema = GraphQLPsiSearchHelper.getInstance(completionElement.getProject()).getBuiltInSchema();
 
                     builtInSchema.accept(new PsiRecursiveElementVisitor() {
                         @Override
@@ -718,7 +718,7 @@ protected void addCompletions(@NotNull final CompletionParameters parameters,
                         // fragment must be compatible with the type in scope
                         final TypeDefinitionRegistry typeDefinitionRegistry = GraphQLSchemaProvider.getInstance(completionElement.getProject()).getTolerantRegistry(parameters.getOriginalFile());
 
-                        final List<GraphQLFragmentDefinition> knownFragmentDefinitions = GraphQLPsiSearchHelper.getService(completionElement.getProject()).getKnownFragmentDefinitions(parameters.getOriginalFile());
+                        final List<GraphQLFragmentDefinition> knownFragmentDefinitions = GraphQLPsiSearchHelper.getInstance(completionElement.getProject()).getKnownFragmentDefinitions(parameters.getOriginalFile());
                         for (GraphQLFragmentDefinition fragmentDefinition : knownFragmentDefinitions) {
                             final String name = fragmentDefinition.getName();
                             if (name != null) {