- Added toolbar action to edit .graphqlconfig file for the selected schema (#164)

jimkyndemeyer · jimkyndemeyer · commit d6f41e6288c7 · 2019-02-13T20:26:36.000+01:00
- Updated schema node to appear as bold when editing its config file
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLConfigSchemaNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLConfigSchemaNode.java
@@ -39,6 +39,7 @@ public class GraphQLConfigSchemaNode extends SimpleNode {
     private final GraphQLConfigManager configManager;
     private final GraphQLResolvedConfigData configData;
     private final VirtualFile configBaseDir;
+    private final VirtualFile configFile;
 
     private final List<GraphQLConfigEndpoint> endpoints;
     private final GraphQLFile configurationEntryFile;
@@ -50,6 +51,7 @@ protected GraphQLConfigSchemaNode(Project project, GraphQLConfigManager configMa
         this.configManager = configManager;
         this.configData = configData;
         this.configBaseDir = configBaseDir;
+        this.configFile = configManager.getClosestConfigFile(configBaseDir);
         if (configData.name != null && !configData.name.isEmpty()) {
             myName = configData.name;
         } else {
@@ -76,6 +78,9 @@ protected GraphQLConfigSchemaNode(Project project, GraphQLConfigManager configMa
      */
     public boolean representsFile(VirtualFile virtualFile) {
         if (virtualFile != null) {
+            if(virtualFile.equals(configFile)) {
+                return true;
+            }
             final GraphQLNamedScope schemaScope = configManager.getSchemaScope(configurationEntryFile.getVirtualFile());
             if (schemaScope != null) {
                 if (schemaScope.getPackageSet().includesVirtualFile(virtualFile)) {
@@ -86,6 +91,10 @@ public boolean representsFile(VirtualFile virtualFile) {
         return false;
     }
 
+    public VirtualFile getConfigFile() {
+        return configFile;
+    }
+
     @Override
     protected void update(PresentationData presentation) {
         super.update(presentation);
@@ -96,13 +105,13 @@ protected void update(PresentationData presentation) {
     @Override
     public SimpleNode[] getChildren() {
         final List<SimpleNode> children = Lists.newArrayList(
-                new GraphQLSchemaContentNode(myProject, this, schemaWithErrors),
-                new GraphQLSchemaErrorsListNode(myProject, schemaWithErrors)
+                new GraphQLSchemaContentNode( this, schemaWithErrors),
+                new GraphQLSchemaErrorsListNode(this, schemaWithErrors)
         );
         if (projectsConfigData != null && !projectsConfigData.isEmpty()) {
             children.add(new GraphQLConfigProjectsNode(this));
         }
-        children.add(new GraphQLSchemaEndpointsListNode(myProject, endpoints));
+        children.add(new GraphQLSchemaEndpointsListNode(this, endpoints));
         return children.toArray(SimpleNode.NO_CHILDREN);
     }
 
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLDefaultSchemaNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLDefaultSchemaNode.java
@@ -39,9 +39,9 @@ protected GraphQLDefaultSchemaNode(Project project) {
     @Override
     public SimpleNode[] getChildren() {
         final List<SimpleNode> children = Lists.newArrayList(
-                new GraphQLSchemaContentNode(myProject, this, schemaWithErrors),
-                new GraphQLSchemaErrorsListNode(myProject, schemaWithErrors),
-                new GraphQLSchemaEndpointsListNode(myProject, null)
+                new GraphQLSchemaContentNode(this, schemaWithErrors),
+                new GraphQLSchemaErrorsListNode(this, schemaWithErrors),
+                new GraphQLSchemaEndpointsListNode(this, null)
         );
         return children.toArray(SimpleNode.NO_CHILDREN);
     }
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaContentNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaContentNode.java
@@ -14,7 +14,6 @@
 import com.intellij.ide.util.gotoByName.SimpleChooseByNameModel;
 import com.intellij.lang.jsgraphql.schema.GraphQLSchemaWithErrors;
 import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
@@ -39,8 +38,8 @@ public class GraphQLSchemaContentNode extends SimpleNode {
 
     private final GraphQLSchemaWithErrors schemaWithErrors;
 
-    public GraphQLSchemaContentNode(Project project, SimpleNode parent, GraphQLSchemaWithErrors schemaWithErrors) {
-        super(project, parent);
+    public GraphQLSchemaContentNode(SimpleNode parent, GraphQLSchemaWithErrors schemaWithErrors) {
+        super(parent);
         this.schemaWithErrors = schemaWithErrors;
 
         final List<String> parts = Lists.newArrayList();
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaEndpointsListNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaEndpointsListNode.java
@@ -42,8 +42,8 @@ public class GraphQLSchemaEndpointsListNode extends SimpleNode {
 
     private final List<GraphQLConfigEndpoint> endpoints;
 
-    public GraphQLSchemaEndpointsListNode(Project project, List<GraphQLConfigEndpoint> endpoints) {
-        super(project);
+    public GraphQLSchemaEndpointsListNode(SimpleNode parent, List<GraphQLConfigEndpoint> endpoints) {
+        super(parent);
         this.endpoints = endpoints;
         myName = "Endpoints";
         setIcon(AllIcons.Nodes.WebFolder);
@@ -54,7 +54,7 @@ public SimpleNode[] getChildren() {
         if (endpoints == null) {
             return new SimpleNode[]{new DefaultEndpointNode(myProject)};
         } else {
-            return endpoints.stream().map(endpoint -> new ConfigurableEndpointNode(myProject, endpoint)).toArray(SimpleNode[]::new);
+            return endpoints.stream().map(endpoint -> new ConfigurableEndpointNode(this, endpoint)).toArray(SimpleNode[]::new);
         }
     }
 
@@ -67,8 +67,8 @@ private static class ConfigurableEndpointNode extends SimpleNode {
 
         private GraphQLConfigEndpoint endpoint;
 
-        public ConfigurableEndpointNode(Project project, GraphQLConfigEndpoint endpoint) {
-            super(project);
+        public ConfigurableEndpointNode(SimpleNode parent, GraphQLConfigEndpoint endpoint) {
+            super(parent);
             this.endpoint = endpoint;
             myName = endpoint.name;
             getTemplatePresentation().setTooltip("Endpoints allow you to perform GraphQL introspection, queries and mutations");
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaErrorNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaErrorNode.java
@@ -8,7 +8,6 @@
 package com.intellij.lang.jsgraphql.ide.project.schemastatus;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.project.Project;
 import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.ui.treeStructure.SimpleTree;
 import graphql.GraphQLError;
@@ -24,8 +23,8 @@ public class GraphQLSchemaErrorNode extends SimpleNode {
 
     private final GraphQLError error;
 
-    public GraphQLSchemaErrorNode(Project project, GraphQLError error) {
-        super(project);
+    public GraphQLSchemaErrorNode(SimpleNode parent, GraphQLError error) {
+        super(parent);
         this.error = error;
         myName = error.getMessage();
         setIcon(AllIcons.Ide.Error);
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaErrorsListNode.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemaErrorsListNode.java
@@ -10,7 +10,6 @@
 import com.google.common.collect.Lists;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.jsgraphql.schema.GraphQLSchemaWithErrors;
-import com.intellij.openapi.project.Project;
 import com.intellij.ui.treeStructure.SimpleNode;
 import graphql.GraphQLError;
 
@@ -23,8 +22,8 @@ public class GraphQLSchemaErrorsListNode extends SimpleNode {
 
     private final GraphQLSchemaWithErrors schemaWithErrors;
 
-    public GraphQLSchemaErrorsListNode(Project project, GraphQLSchemaWithErrors schemaWithErrors) {
-        super(project);
+    public GraphQLSchemaErrorsListNode(SimpleNode parent, GraphQLSchemaWithErrors schemaWithErrors) {
+        super(parent);
         this.schemaWithErrors = schemaWithErrors;
         myName = "Schema errors";
         setIcon(AllIcons.Nodes.TreeClosed);
@@ -34,10 +33,10 @@ public GraphQLSchemaErrorsListNode(Project project, GraphQLSchemaWithErrors sche
     public SimpleNode[] getChildren() {
         final List<SimpleNode> children = Lists.newArrayList();
         for (GraphQLError error : schemaWithErrors.getErrors()) {
-            children.add(new GraphQLSchemaErrorNode(myProject, error));
+            children.add(new GraphQLSchemaErrorNode(this, error));
         }
         if (children.isEmpty()) {
-            SimpleNode noErrors = new SimpleNode() {
+            SimpleNode noErrors = new SimpleNode(this) {
                 @Override
                 public SimpleNode[] getChildren() {
                     return NO_CHILDREN;
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemasPanel.java b/src/main/com/intellij/lang/jsgraphql/ide/project/schemastatus/GraphQLSchemasPanel.java
@@ -14,6 +14,7 @@
 import com.intellij.lang.jsgraphql.schema.GraphQLSchemaChangeListener;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
 import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.project.DumbServiceImpl;
@@ -22,6 +23,7 @@
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.SideBorder;
 import com.intellij.ui.components.JBScrollPane;
+import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.ui.treeStructure.SimpleTree;
 import com.intellij.ui.treeStructure.SimpleTreeBuilder;
 import com.intellij.ui.treeStructure.SimpleTreeStructure;
@@ -155,6 +157,31 @@ public void actionPerformed(AnActionEvent e) {
                 }
             }
         });
+        leftActionGroup.add(new AnAction("Edit selected schema configuration", "Opens the .graphqlconfig file for the selected schema", AllIcons.General.Settings) {
+            @Override
+            public void actionPerformed(AnActionEvent e) {
+                GraphQLConfigSchemaNode selectedSchemaNode = getSelectedSchemaNode();
+                if (selectedSchemaNode != null && selectedSchemaNode.getConfigFile() != null) {
+                    FileEditorManager.getInstance(myProject).openFile(selectedSchemaNode.getConfigFile(), true);
+                }
+            }
+
+            @Override
+            public void update(AnActionEvent e) {
+                e.getPresentation().setEnabled(getSelectedSchemaNode() != null);
+            }
+
+            private GraphQLConfigSchemaNode getSelectedSchemaNode() {
+                SimpleNode node = myTree.getSelectedNode();
+                while (node != null) {
+                    if (node instanceof GraphQLConfigSchemaNode) {
+                        return (GraphQLConfigSchemaNode) node;
+                    }
+                    node = node.getParent();
+                }
+                return null;
+            }
+        });
         leftActionGroup.add(new AnAction("Restart schema discovery", "Performs GraphQL schema discovery across the project", AllIcons.Actions.Refresh) {
             @Override
             public void actionPerformed(AnActionEvent e) {
