Improved "projects" support in .graphqlconfig (#164)

- Fixed entry file for project schemas not being recognized by schema scopes
- The Schemas Tree View root node no longer attempts schema discovery when projects have been configured as this would potentially create an invalid "root" schema with duplicate types intended to only be part of separate schemas

Author: jimkyndemeyer

src/main/com/intellij/lang/jsgraphql/ide/project/graphqlconfig/GraphQLConfigManager.java

@@ -411,7 +411,9 @@ public void buildConfigurationModel(@Nullable List<VirtualFile> changedConfigura
                         projectConfig.extensions = baseConfig.extensions;
                     } else if (baseConfig.extensions != null) {
                         for (Map.Entry<String, Object> extension : baseConfig.extensions.entrySet()) {
-                            projectConfig.extensions.put(extension.getKey(), extension.getValue());
+                            if (!projectConfig.extensions.containsKey(extension.getKey())) {
+                                projectConfig.extensions.put(extension.getKey(), extension.getValue());
+                            }
                         }
                     }
                 });
@@ -501,10 +503,24 @@ public GraphQLNamedScope getSchemaScope(VirtualFile virtualFile) {
                     // handle entry files
                     configBaseDir = null;
                     for (Map.Entry<VirtualFile, GraphQLConfigData> entry : configPathToConfigurations.entrySet()) {
-                        GraphQLFile entryFile = getConfigurationEntryFile(entry.getValue());
+                        final GraphQLConfigData configData = entry.getValue();
+                        GraphQLFile entryFile = getConfigurationEntryFile(configData);
+                        boolean found = false;
                         if (entryFile.getVirtualFile().equals(virtualFile)) {
                             // the virtual file is an entry file for the specific config base (either the root schema or one of the nested graphql-config project schemas)
                             configBaseDir = entry.getKey();
+                            found = true;
+                        } else if(configData.projects != null) {
+                            for (Map.Entry<String, GraphQLResolvedConfigData> projectEntry : configData.projects.entrySet()) {
+                                entryFile = getConfigurationEntryFile(projectEntry.getValue());
+                                if (entryFile.getVirtualFile().equals(virtualFile)) {
+                                    configBaseDir = entry.getKey();
+                                    found = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (found) {
                             break;
                         }
                     }

src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLConfigSchemaNode.java

@@ -45,6 +45,7 @@ public class GraphQLConfigSchemaNode extends SimpleNode {
     private final GraphQLFile configurationEntryFile;
 
     private Map<String, GraphQLResolvedConfigData> projectsConfigData;
+    private boolean performSchemaDiscovery = true;
 
     protected GraphQLConfigSchemaNode(Project project, GraphQLConfigManager configManager, GraphQLResolvedConfigData configData, VirtualFile configBaseDir) {
         super(project);
@@ -58,33 +59,44 @@ protected GraphQLConfigSchemaNode(Project project, GraphQLConfigManager configMa
             // use the last part of the folder as name
             myName = StringUtils.substringAfterLast(configBaseDir.getPath(), "/");
         }
-        getPresentation().setLocationString(configBaseDir.getPresentableUrl());
-        getPresentation().setIcon(JSGraphQLIcons.Files.GraphQLSchema);
-
-        final GraphQLTypeDefinitionRegistryServiceImpl registry = GraphQLTypeDefinitionRegistryServiceImpl.getService(myProject);
 
-        configurationEntryFile = configManager.getConfigurationEntryFile(configData);
-        endpoints = configManager.getEndpoints(configurationEntryFile.getVirtualFile());
-        schemaWithErrors = registry.getSchemaWithErrors(configurationEntryFile);
+        getPresentation().setIcon(JSGraphQLIcons.Files.GraphQLSchema);
 
         if (configData instanceof GraphQLConfigData) {
+            getPresentation().setLocationString(configBaseDir.getPresentableUrl());
             projectsConfigData = ((GraphQLConfigData) configData).projects;
+            // this node is only considered a "real" schema that should be discovered if the config file doesn't use projects
+            // if the config uses projects we can't do discovery at the root level as that's likely to consider multiple distinct schemas
+            // as one with resulting re-declaration errors during validation
+            performSchemaDiscovery = projectsConfigData == null || projectsConfigData.isEmpty();
         }
 
+        if (performSchemaDiscovery) {
+            final GraphQLTypeDefinitionRegistryServiceImpl registry = GraphQLTypeDefinitionRegistryServiceImpl.getService(myProject);
+            configurationEntryFile = configManager.getConfigurationEntryFile(configData);
+            endpoints = configManager.getEndpoints(configurationEntryFile.getVirtualFile());
+            schemaWithErrors = registry.getSchemaWithErrors(configurationEntryFile);
+        } else {
+            schemaWithErrors = null;
+            endpoints = null;
+            configurationEntryFile = null;
+        }
     }
 
     /**
      * Gets whether this node contains a schema that includes the specified file
      */
     public boolean representsFile(VirtualFile virtualFile) {
         if (virtualFile != null) {
-            if(virtualFile.equals(configFile)) {
+            if (virtualFile.equals(configFile)) {
                 return true;
             }
-            final GraphQLNamedScope schemaScope = configManager.getSchemaScope(configurationEntryFile.getVirtualFile());
-            if (schemaScope != null) {
-                if (schemaScope.getPackageSet().includesVirtualFile(virtualFile)) {
-                    return true;
+            if (performSchemaDiscovery) {
+                final GraphQLNamedScope schemaScope = configManager.getSchemaScope(configurationEntryFile.getVirtualFile());
+                if (schemaScope != null) {
+                    if (schemaScope.getPackageSet().includesVirtualFile(virtualFile)) {
+                        return true;
+                    }
                 }
             }
         }
@@ -104,20 +116,23 @@ protected void update(PresentationData presentation) {
 
     @Override
     public SimpleNode[] getChildren() {
-        final List<SimpleNode> children = Lists.newArrayList(
-                new GraphQLSchemaContentNode( this, schemaWithErrors),
-                new GraphQLSchemaErrorsListNode(this, schemaWithErrors)
-        );
+        final List<SimpleNode> children = Lists.newArrayList();
+        if (performSchemaDiscovery) {
+            children.add(new GraphQLSchemaContentNode(this, schemaWithErrors));
+            children.add(new GraphQLSchemaErrorsListNode(this, schemaWithErrors));
+        }
         if (projectsConfigData != null && !projectsConfigData.isEmpty()) {
             children.add(new GraphQLConfigProjectsNode(this));
         }
-        children.add(new GraphQLSchemaEndpointsListNode(this, endpoints));
+        if (endpoints != null) {
+            children.add(new GraphQLSchemaEndpointsListNode(this, endpoints));
+        }
         return children.toArray(SimpleNode.NO_CHILDREN);
     }
 
     @Override
     public boolean isAutoExpandNode() {
-        return representsCurrentFile();
+        return representsCurrentFile() || !performSchemaDiscovery;
     }
 
     @NotNull