Merge pull request #60 from rogyar/43-jsgraphql-dependency

JSGraphql configured as an optional dependency

Author: Vitaliy

resources/META-INF/plugin.xml

@@ -35,7 +35,7 @@
     <depends>com.jetbrains.php</depends>
     <depends>JavaScript</depends>
     <depends>com.intellij.modules.platform</depends>
-    <depends>com.intellij.lang.jsgraphql</depends>
+    <depends optional="true" config-file="withJsGraphQl.xml">com.intellij.lang.jsgraphql</depends>
 
     <actions>
         <group id="MagentoGenerateGroup">
@@ -91,15 +91,12 @@
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.DataIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.PageIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.mftf.StepKeyIndex" />
-        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.graphql.GraphQlResolverIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.RequireJsIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
 
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.php.linemarker.PluginLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.php.linemarker.ClassConfigurationLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.php.linemarker.WebApiLineMarkerProvider"/>
-        <codeInsight.lineMarkerProvider language="GraphQL" implementationClass="com.magento.idea.magento2plugin.graphql.linemarker.GraphQlResolverClassLineMarkerProvider"/>
-        <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.php.linemarker.GraphQlResolverUsageLineMarkerProvider"/>
 
         <directoryProjectConfigurator implementation="com.magento.idea.magento2plugin.project.ProjectDetector"/>
 

resources/META-INF/withJsGraphQl.xml

@@ -0,0 +1,7 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.graphql.GraphQlResolverIndex" />
+        <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.php.linemarker.GraphQlResolverUsageLineMarkerProvider"/>
+        <codeInsight.lineMarkerProvider language="GraphQL" implementationClass="com.magento.idea.magento2plugin.graphql.linemarker.GraphQlResolverClassLineMarkerProvider"/>
+    </extensions>
+</idea-plugin>

src/com/magento/idea/magento2plugin/php/linemarker/GraphQlResolverUsageLineMarkerProvider.java

@@ -71,7 +71,7 @@ private boolean isResolver(PhpClass psiElement) {
 
     private static class GraphQlUsagesCollector {
 
-        private HashMap<String, List<GraphQLQuotedString>> routesCache = new HashMap<>();
+        private HashMap<String, List<GraphQLQuotedString>> graphQlCache = new HashMap<>();
 
         List<GraphQLQuotedString> getGraphQLUsages(@NotNull PhpClass phpClass) {
             List<GraphQLQuotedString> graphQLQuotedStrings = new ArrayList<>();
@@ -83,11 +83,11 @@ List<GraphQLQuotedString> getGraphQLUsages(@NotNull PhpClass phpClass) {
 
         List<GraphQLQuotedString> getUsages(@NotNull PhpClass phpClass) {
             String phpClassFQN = phpClass.getFQN();
-            if (!routesCache.containsKey(phpClassFQN)) {
+            if (!graphQlCache.containsKey(phpClassFQN)) {
                 List<GraphQLQuotedString> graphQLStringValues = extractGraphQLQuotesStringsForClass(phpClass);
-                routesCache.put(phpClassFQN, graphQLStringValues);
+                graphQlCache.put(phpClassFQN, graphQLStringValues);
             }
-            return routesCache.get(phpClassFQN);
+            return graphQlCache.get(phpClassFQN);
         }
 
         List<GraphQLQuotedString> extractGraphQLQuotesStringsForClass(@NotNull PhpClass phpClass) {

src/com/magento/idea/magento2plugin/stubs/indexes/graphql/GraphQlResolverIndex.java

@@ -34,10 +34,10 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
         return inputData -> {
             Map<String, Void> map = new HashMap<>();
 
-            GraphQLFile qraphQLFile = (GraphQLFile) inputData.getPsiFile();
-            PsiElement[] children = qraphQLFile.getChildren();
+            GraphQLFile graphQLFile = (GraphQLFile) inputData.getPsiFile();
+            PsiElement[] children = graphQLFile.getChildren();
             for (PsiElement child : children) {
-                if (!(child instanceof GraphQLObjectTypeDefinition)) {
+                if (!(child instanceof GraphQLObjectTypeDefinition) && !(child instanceof GraphQLInterfaceTypeDefinition)) {
                     continue;
                 }
                 PsiElement[] objectChildren = child.getChildren();