Made GraphQL language injection compatible with new PSI for tagged templates in IDEA 2017.1 EAP (#60)

Author: jimkyndemeyer

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.1 (2017-02-12)
+
+Fixes:
+
+- 2017.1 EAP Not detecting Relay.QL usage (#60)
+
 ## 1.5.0 (2017-01-29)
 
 Features:

resources/META-INF/plugin.xml

@@ -10,7 +10,7 @@
 <idea-plugin version="2">
   <id>com.intellij.lang.jsgraphql</id>
   <name>JS GraphQL</name>
-  <version>1.5.0</version>
+  <version>1.5.1</version>
   <vendor>Jim Kynde Meyer - [email protected]</vendor>
 
   <description><![CDATA[
@@ -29,6 +29,7 @@
 
   <change-notes><![CDATA[
     <ul>
+      <li>1.5.1: Compatible with IntelliJ IDEA 2017.1 EAP tagged template expressions.</li>
       <li>1.5.0: Language Service 1.4.0 based on graphql 0.9.1 and codemirror-graphql 0.6.2. Experimental support for GraphQL Endpoint Language (.graphqle)</li>
       <li>1.4.4: Fixes Assertion failed: Caret model is in its update process.</li>
       <li>1.4.3: GraphQL configuration page for indentation. Language Service 1.3.2: Object literal for variables in getFragment closes Relay.QL template expression.</li>

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

@@ -80,9 +80,16 @@ public static boolean isJSGraphQLLanguageInjectionTarget(PsiElement host, @Nulla
         if (host instanceof JSStringTemplateExpression && host instanceof PsiLanguageInjectionHost) {
             JSStringTemplateExpression template = (JSStringTemplateExpression) host;
             // check if we're a Relay.QL or graphql tagged template
-            final PsiElement firstChild = template.getFirstChild();
-            if (firstChild instanceof JSReferenceExpression) {
-                final String tagText = firstChild.getText();
+            JSReferenceExpression tagExpression = null;
+            if(template.getFirstChild() instanceof JSReferenceExpression) {
+                // up to version 2016.X
+                tagExpression = (JSReferenceExpression) template.getFirstChild();
+            } else if(template.getPrevSibling() instanceof JSReferenceExpression) {
+                // from version 2017.1
+                tagExpression = (JSReferenceExpression) template.getPrevSibling();
+            }
+            if (tagExpression != null) {
+                final String tagText = tagExpression.getText();
                 if (SUPPORTED_TAG_NAMES.contains(tagText)) {
                     if (envRef != null) {
                         envRef.set(getEnvironmentFromTemplateTag(tagText, host));

src/main/com/intellij/lang/jsgraphql/ide/notifications/JSGraphQLConfigEditorNotificationProvider.java

@@ -7,7 +7,6 @@
  */
 package com.intellij.lang.jsgraphql.ide.notifications;
 
-import com.google.common.collect.Sets;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.lang.jsgraphql.JSGraphQLFileType;
 import com.intellij.lang.jsgraphql.JSGraphQLParserDefinition;
@@ -26,16 +25,13 @@
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.EditorNotifications;
 import com.intellij.ui.EditorNotifications.Provider;
-import com.intellij.util.containers.ContainerUtil;
-import com.intellij.webcore.ui.ModuleSelectionDialog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;