Added 2.0.0-alpha-2 (#164)

- Removed references to JavaScript and TypeScript file types in JSGraphQLFindUsagesUtil.java which caused errors when running in Android Studio
- Updated release info in plugin.xml to match alpha feature set

Author: jimkyndemeyer

alpha-releases/JS GraphQL-2.0.0-alpha-2.zip

@@ -1,3 +1,3 @@
 <plugins>
-    <plugin id="com.intellij.lang.jsgraphql" url="https://github.com/jimkyndemeyer/js-graphql-intellij-plugin/blob/v2/alpha-releases/JS%20GraphQL-2.0.0-alpha-1.zip?raw=true" version="2.0.0-alpha-1"/>
+    <plugin id="com.intellij.lang.jsgraphql" url="https://github.com/jimkyndemeyer/js-graphql-intellij-plugin/blob/v2/alpha-releases/JS%20GraphQL-2.0.0-alpha-2.zip?raw=true" version="2.0.0-alpha-2"/>
 </plugins>

alpha-releases/updatePlugins.xml

@@ -12,7 +12,7 @@ plugins {
 }
 
 group 'com.intellij.lang.jsgraphql'
-version '2.0.0-alpha-1'
+version '2.0.0-alpha-2'
 
 apply plugin: 'java'
 

build.gradle

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="js-graphql-intellij-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.intellij.lang.jsgraphql" external.system.module.version="2.0.0-alpha-1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="js-graphql-intellij-plugin" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.intellij.lang.jsgraphql" external.system.module.version="2.0.0-alpha-2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

js-graphql-intellij-plugin.iml

@@ -10,49 +10,24 @@
 <idea-plugin>
   <id>com.intellij.lang.jsgraphql</id>
   <name>JS GraphQL</name>
-  <version>2.0.0-alpha-1</version>
+  <version>2.0.0-alpha-2</version>
   <vendor>Jim Kynde Meyer - [email protected]</vendor>
 
   <description><![CDATA[
       <p>GraphQL language support including Relay.QL tagged templates in JavaScript and TypeScript.</p>
       <p>Provides the following features:</p>
       <ul>
-        <li>Schema-aware completion, error highlighting, and documentation</li>
+        <li>Schema-aware completion, error highlighting</li>
         <li>Syntax highlighting, code-formatting, folding, commenter, and brace-matching</li>
         <li>'Find Usages' and 'Go to Declaration' for schema types and fields</li>
-        <li>Schema viewer and 'Go to Implementation' for schema interfaces</li>
-        <li>'Structure view' to navigate GraphQL and GraphQL Schema files</li>
-        <li>Configurable GraphQL schema retrieval and reloading based on a local file or a url using 'then-request'</li>
+        <li>'Go to Implementation' for schema interfaces</li>
         <li>Execute queries with variables against configurable endpoints</li>
       </ul>
     ]]></description>
 
   <change-notes><![CDATA[
     <ul>
-      <li>1.7.2: Restore whitespace tokens for top level fragment placeholders in Apollo to preserve them during format lines.</li>
-      <li>1.7.1: Node 10 Buffer deprecation warning no longer read by plugin as an error in the language service. Two additional minor bug-fixes.</li>
-      <li>1.7.0: Fixed editor background loading issue. Language Service 1.5.1: Support for strongly typed variable placeholders in GraphQL tagged templates. Support for declaring annotations in Endpoint language.</li>
-      <li>1.6.3: 'Editor > Code Style' never loads In WebStorm 2017.3.</li>
-      <li>1.6.2: Resolve fragment references under progress in annotator to ensure WebStorm 2017.3 compatibility.</li>
-      <li>1.6.1: 2017.3 compatibility.</li>
-      <li>1.6.0: Support for Relay Modern fragments. Language Service 1.5.0: Support for loading the schema from .graphql file (Relay Modern projects).</li>
-      <li>1.5.4: Only show the error console automatically on the first error in the project. Fixes Int variables being sent as floats. Fixes auto-import is not placed on a new line in JS files with GraphQL templates.</li>
-      <li>1.5.3: Support Relay Modern graphql.experimental tag.</li>
-      <li>1.5.2: Pass "variables" in payload to GraphQL server as JSON.</li>
-      <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>
-      <li>1.4.2: Language Service 1.3.1: Support __schema root in schema.json.</li>
-      <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.3: Fixes compatibility issue with IDEA 2016.2.2</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>
-      <li>1.3.0: Adds support for GraphQL Scratch Files. Query results are now formatted.</li>
-      <li>1.2.0: Contextual query support: Execute buffer, selection, or named operations at the caret position in the GraphQL editor</li>
-      <li>1.1.1: Completion after ... fragment spread operator. Language Service 1.1.1 based on graphql 0.4.16 and codemirror-graphql 0.2.2</li>
-      <li>1.1.0: Find usages, schema viewer, structure view</li>
+      <li>2.0.0-alpha-2: Language support for GraphQL draft spec as of June 2018. Compatible with Android Studio 3.1 and IntelliJ IDEA Community Edition</li>
     </ul>
     ]]>
   </change-notes>

resources/META-INF/plugin.xml

@@ -7,6 +7,7 @@
  */
 package com.intellij.lang.jsgraphql.v1.ide.findUsages;
 
+import com.intellij.lang.jsgraphql.ide.references.GraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.schema.ide.project.JSGraphQLSchemaLanguageProjectService;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.ProjectAndLibrariesScope;
@@ -35,7 +36,7 @@ public boolean contains(@NotNull VirtualFile file) {
         }
 
         // we're only interested in usages in GraphQL, JavaScript and TypeScript files
-        return JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.contains(file.getFileType()) && super.contains(file);
+        return GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.contains(file.getFileType()) && super.contains(file);
 
     }
 

src/main/com/intellij/lang/jsgraphql/v1/ide/findUsages/JSGraphQLFindUsagesUtil.java

@@ -10,8 +10,8 @@
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.lang.jsgraphql.GraphQLFileType;
 import com.intellij.lang.jsgraphql.GraphQLParserDefinition;
+import com.intellij.lang.jsgraphql.ide.references.GraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.ide.configuration.JSGraphQLConfigurationProvider;
-import com.intellij.lang.jsgraphql.v1.ide.findUsages.JSGraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.languageservice.JSGraphQLNodeLanguageServiceClient;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
@@ -92,7 +92,7 @@ protected boolean isGraphQLRelatedFile(VirtualFile file) {
         if(file.getFileType() == GraphQLFileType.INSTANCE) {
             return true;
         }
-        if(JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.contains(file.getFileType())) {
+        if(GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.contains(file.getFileType())) {
             return true;
         }
         return false;

src/main/com/intellij/lang/jsgraphql/v1/ide/findUsages/JSGraphQLProjectAndLibrariesScope.java

@@ -10,8 +10,8 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.intellij.lang.jsgraphql.ide.references.GraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.JSGraphQLTokenTypes;
-import com.intellij.lang.jsgraphql.v1.ide.findUsages.JSGraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.psi.JSGraphQLFragmentDefinitionPsiElement;
 import com.intellij.lang.jsgraphql.v1.psi.JSGraphQLNamedTypePsiElement;
 import com.intellij.openapi.components.ServiceManager;
@@ -35,7 +35,7 @@
  */
 public class JSGraphQLPsiSearchHelper {
 
-    private static final FileType[] FILE_TYPES = JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.toArray(new FileType[JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.size()]);
+    private static final FileType[] FILE_TYPES = GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.toArray(new FileType[GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.size()]);
 
     private final Project myProject;
     private final Map<String, JSGraphQLNamedTypePsiElement> fragmentDefinitionsByName = Maps.newConcurrentMap();

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

@@ -8,8 +8,8 @@
 package com.intellij.lang.jsgraphql.v1.psi;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.lang.jsgraphql.ide.references.GraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.JSGraphQLTokenTypes;
-import com.intellij.lang.jsgraphql.v1.ide.findUsages.JSGraphQLFindUsagesUtil;
 import com.intellij.lang.jsgraphql.v1.schema.ide.project.JSGraphQLSchemaLanguageProjectService;
 import com.intellij.lang.jsgraphql.v1.schema.psi.JSGraphQLSchemaFile;
 import com.intellij.openapi.fileTypes.FileType;
@@ -121,7 +121,7 @@ public SearchScope getUseScope() {
 
     @NotNull
     private GlobalSearchScope createFileTypeRestrictedUsageScope(Project project) {
-        FileType[] fileTypes = JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.toArray(new FileType[JSGraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.size()]);
+        FileType[] fileTypes = GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.toArray(new FileType[GraphQLFindUsagesUtil.INCLUDED_FILE_TYPES.size()]);
         return GlobalSearchScope.getScopeRestrictedByFileTypes(ProjectScope.getAllScope(project), fileTypes);
     }