Support injection in gatsby's "graphql(...)" #294

Author: vepanimas

src/main/com/intellij/lang/jsgraphql/javascript/injection/GraphQLJavaScriptLanguageInjectionUtil.java

@@ -9,12 +9,15 @@
 
 import com.google.common.collect.Sets;
 import com.intellij.lang.javascript.JSTokenTypes;
+import com.intellij.lang.javascript.patterns.JSPatterns;
+import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.lang.javascript.psi.ecma6.ES6TaggedTemplateExpression;
 import com.intellij.lang.javascript.psi.ecma6.JSStringTemplateExpression;
 import com.intellij.lang.jsgraphql.ide.injection.GraphQLCommentBasedInjectionHelper;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilCore;
@@ -38,6 +41,8 @@ public class GraphQLJavaScriptLanguageInjectionUtil {
     public static final String GQL_TEMPLATE_TAG = "gql";
     public static final String APOLLO_GQL_TEMPLATE_TAG = "Apollo.gql";
 
+    private static final ElementPattern<JSExpression> GRAPHQL_CALL_ARG_PATTERN = JSPatterns.jsArgument(GRAPHQL_TEMPLATE_TAG, 0);
+
     public final static Set<String> SUPPORTED_TAG_NAMES = Sets.newHashSet(
         RELAY_QL_TEMPLATE_TAG,
         GRAPHQL_TEMPLATE_TAG,
@@ -47,16 +52,19 @@ public class GraphQLJavaScriptLanguageInjectionUtil {
     );
 
     public static boolean isGraphQLLanguageInjectionTarget(@Nullable PsiElement host) {
-        if (!(host instanceof JSStringTemplateExpression)) {
+        if (!(host instanceof JSStringTemplateExpression template)) {
             return false;
         }
 
         // gql``, Relay.QL``, etc
-        JSStringTemplateExpression template = (JSStringTemplateExpression) host;
         if (isInjectedUsingTemplateTag(template)) {
             return true;
         }
 
+        if (isInjectedInCallArgument(template)) {
+            return true;
+        }
+
         // built-in "language=GraphQL" injection comments
         if (isInjectedUsingBuiltInComments(template)) {
             return true;
@@ -100,6 +108,12 @@ private static boolean isInjectedUsingTemplateTag(@NotNull JSStringTemplateExpre
         return builderTailName != null && SUPPORTED_TAG_NAMES.contains(builderTailName);
     }
 
+    private static boolean isInjectedInCallArgument(@NotNull JSStringTemplateExpression template) {
+        PsiElement parent = template.getParent();
+        PsiElement expr = parent instanceof ES6TaggedTemplateExpression ? parent : template;
+        return GRAPHQL_CALL_ARG_PATTERN.accepts(expr);
+    }
+
     /**
      * Checks a case when the possible injection contains a EOL comment "# graphql".
      */

src/test/com/intellij/lang/jsgraphql/injection/GraphQLInjectionHighlightingTest.java

@@ -110,6 +110,10 @@ public void testInjectedWithCStyleCommentMultipleVars() {
         doTestInjectedFile("cStyleCommentMultipleVars.js");
     }
 
+    public void testInjectedInCallArgument() {
+        doTestInjectedFile("callArgument.js");
+    }
+
     private @NotNull PsiFile doTestInjectedFile(@NotNull String sourcePath) {
         myFixture.configureByFile(sourcePath);
 

test-resources/testData/graphql/injection/callArgument.js

@@ -0,0 +1,5 @@
+const QUERY = graphql(`
+    query {
+        field
+    }
+`);