Trigger GraphQL language injection for builder APIs ending with supported tag (#112)

Author: jimkyndemeyer

src/main/com/intellij/lang/jsgraphql/ide/editor/JSGraphQLLineMarkerProvider.java

@@ -24,6 +24,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import static com.intellij.lang.jsgraphql.ide.injection.JSGraphQLLanguageInjectionUtil.*;
+
 public class JSGraphQLLineMarkerProvider implements LineMarkerProvider {
 
     @Nullable
@@ -46,20 +48,21 @@ private LineMarkerInfo createLineMarkerInfo(PsiElement element, Ref<String> envR
         final String tooltip;
         final String url;
         boolean configureGQL = false;
-        if(JSGraphQLLanguageInjectionUtil.RELAY_ENVIRONMENT.equals(envRef.get())) {
+        final String environment = envRef.get();
+        if(RELAY_ENVIRONMENT.equals(environment)) {
             icon = JSGraphQLIcons.Logos.Relay;
             tooltip = "Relay GraphQL Template";
             url = "https://facebook.github.io/relay/docs/api-reference-relay-ql.html";
-        } else if(JSGraphQLLanguageInjectionUtil.GRAPHQL_ENVIRONMENT.equals(envRef.get())) {
+        } else if(GRAPHQL_ENVIRONMENT.equals(environment) || GRAPHQL_TEMPLATE_ENVIRONMENT.equals(environment)) {
             icon = JSGraphQLIcons.Logos.GraphQL;
             tooltip = "GraphQL";
             url = "http://graphql.org/";
-        } else if(JSGraphQLLanguageInjectionUtil.APOLLO_ENVIRONMENT.equals(envRef.get())) {
+        } else if(APOLLO_ENVIRONMENT.equals(environment)) {
             icon = JSGraphQLIcons.Logos.Apollo;
             tooltip = "Apollo Client GraphQL Template";
             url = "http://docs.apollostack.com/apollo-client/core.html";
             configureGQL = true;
-        } else if(JSGraphQLLanguageInjectionUtil.LOKKA_ENVIRONMENT.equals(envRef.get())) {
+        } else if(LOKKA_ENVIRONMENT.equals(environment)) {
             icon = JSGraphQLIcons.Logos.Lokka;
             tooltip = "Lokka GraphQL Template";
             url = "https://github.com/kadirahq/lokka";

src/main/com/intellij/lang/jsgraphql/ide/injection/JSGraphQLLanguageInjectionUtil.java

@@ -9,6 +9,7 @@
 
 import com.google.common.collect.Sets;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSFile;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.ecma6.JSStringTemplateExpression;
@@ -42,6 +43,7 @@ public class JSGraphQLLanguageInjectionUtil {
 
 
     public static final String GRAPHQL_ENVIRONMENT = "graphql";
+    public static final String GRAPHQL_TEMPLATE_ENVIRONMENT = "graphql-template";
     public static final String RELAY_ENVIRONMENT = "relay";
     public static final String APOLLO_ENVIRONMENT = "apollo";
     public static final String LOKKA_ENVIRONMENT = "lokka";
@@ -93,8 +95,14 @@ public static boolean isJSGraphQLLanguageInjectionTarget(PsiElement host, @Nulla
                 tagExpression = (JSReferenceExpression) template.getPrevSibling();
             }
             if (tagExpression != null) {
-                final String tagText = tagExpression.getText();
-                if (SUPPORTED_TAG_NAMES.contains(tagText)) {
+                String tagText = tagExpression.getText();
+                boolean isSupportedTag = SUPPORTED_TAG_NAMES.contains(tagText);
+                if(!isSupportedTag && tagExpression.getQualifier() != null && tagExpression.getReferenceNameElement() != null) {
+                    // also allow builder patterns to trigger injection, e.g. 'builder.foo.bar.graphql``'
+                    tagText = tagExpression.getReferenceNameElement().getText();
+                    isSupportedTag = SUPPORTED_TAG_NAMES.contains(tagText);
+                }
+                if (isSupportedTag) {
                     if (envRef != null) {
                         envRef.set(getEnvironmentFromTemplateTag(tagText, host));
                     }
@@ -110,6 +118,13 @@ public static String getEnvironmentFromTemplateTag(String tagText, PsiElement ho
             return RELAY_ENVIRONMENT;
         }
         if (GRAPHQL_TEMPLATE_TAG.equals(tagText) || GRAPHQL_EXPERIMENTAL_TEMPLATE_TAG.equals(tagText)) {
+            if(host instanceof JSStringTemplateExpression) {
+                final JSExpression[] arguments = ((JSStringTemplateExpression) host).getArguments();
+                if(arguments.length > 0) {
+                    // one or more placeholders inside the tagged template text, so consider it templated graphql
+                    return GRAPHQL_TEMPLATE_ENVIRONMENT;
+                }
+            }
             return GRAPHQL_ENVIRONMENT;
         }
         if (GQL_TEMPLATE_TAG.equals(tagText)) {