Support for gql tagged templates used by Apollo and Lokka GraphQL Clients (#25)

(cherry picked from commit 2ac5950)

Author: jimkyndemeyer

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.4.1 (2016-09-11)
+
+Features:
+
+- Support for gql tagged templates used by Apollo and Lokka GraphQL Clients (#25)
+- Language Service 1.3.0 with Lokka and Apollo gql support (#25)
+- Persist endpoint selection to project configuration
+
+Changes:
+
+- Fixes false Error in Relay Mutation (#23)
+
+
 ## 1.4.0 (2016-08-28)
 
 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.4.0.143-145</version>
+  <version>1.4.1.143-145</version>
   <vendor>Jim Kynde Meyer - [email protected]</vendor>
 
   <description><![CDATA[
@@ -29,6 +29,7 @@
 
   <change-notes><![CDATA[
     <ul>
+      <li>1.4.1: Support for gql tagged templates used by Apollo and Lokka GraphQL Clients. Fixes false Error in Relay Mutation.</li>
       <li>1.4.0: Language Service 1.2.0 based on graphql 0.7.0 and codemirror-graphql 0.5.4. Basic editor support for GraphQL Schema (.graphqls)</li>
       <li>1.3.2: Removes GraphQL schema from scratch file formats.</li>
       <li>1.3.1: Fixes compatibility issue with WebStorm 2016.2 EAP.</li>
@@ -131,6 +132,7 @@
     <!-- Editor notification bars and markers -->
     <editorNotificationProvider implementation="com.intellij.lang.jsgraphql.ide.notifications.JSGraphQLNodeInterpreterEditorNotificationProvider"/>
     <editorNotificationProvider implementation="com.intellij.lang.jsgraphql.ide.notifications.JSGraphQLConfigEditorNotificationProvider"/>
+    <editorNotificationProvider implementation="com.intellij.lang.jsgraphql.ide.notifications.JSGraphQLApolloLokkaEditorNotificationProvider"/>
     <codeInsight.lineMarkerProvider language="JavaScript" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLLineMarkerProvider" />
 
     <editorTabColorProvider implementation="com.intellij.lang.jsgraphql.schema.ide.project.JSGraphQLSchemaEditorTabColorProvider" />

src/main/com/intellij/lang/jsgraphql/icons/JSGraphQLIcons.java

@@ -16,6 +16,8 @@ public class JSGraphQLIcons {
     public static class Logos {
         public static final Icon GraphQL = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/graphql.png");
         public static final Icon Relay = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/relay.png");
+        public static final Icon Apollo = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/apollo.png");
+        public static final Icon Lokka = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/lokka.png");
     }
 
     public static class Files {

src/main/com/intellij/lang/jsgraphql/icons/apollo.png

@@ -54,8 +54,8 @@ public JSGraphQLAnnotationResult collectInformation(@NotNull PsiFile file, @NotN
                     buffer = getWhitespacePaddedGraphQL(file, buffer);
                 }
                 if (buffer.length() > 0) {
-                    final boolean relay = JSGraphQLLanguageInjectionUtil.isRelayInjection(file);
-                    final AnnotationsResponse annotations = JSGraphQLNodeLanguageServiceClient.getAnnotations(buffer.toString(), file.getProject(), relay);
+                    final String environment = JSGraphQLLanguageInjectionUtil.getEnvironment(file);
+                    final AnnotationsResponse annotations = JSGraphQLNodeLanguageServiceClient.getAnnotations(buffer.toString(), file.getProject(), environment);
                     return new JSGraphQLAnnotationResult(annotations, editor);
                 }
             } else if(file instanceof JSGraphQLSchemaFile) {