Merge remote-tracking branch 'origin/master' into v2

# Conflicts:
#	resources/META-INF/plugin.xml
#	src/main/com/intellij/lang/jsgraphql/ide/highlighting/JSGraphQLSyntaxHighlighter.java
#	src/main/com/intellij/lang/jsgraphql/ide/notifications/JSGraphQLNodeInterpreterEditorNotificationProvider.java
#	src/main/com/intellij/lang/jsgraphql/schema/ide/search/JSGraphQLDefinitionsSearchExecutor.java
#	src/main/com/intellij/lang/jsgraphql/v1/ide/project/JSGraphQLLanguageUIProjectService.java

Author: jimkyndemeyer

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+## Before you create the issue
+- Please search the existing issues at https://github.com/jimkyndemeyer/js-graphql-intellij-plugin/issues?q=sort%3Aupdated-desc before opening a new issue.
+- Read the FAQ at https://github.com/jimkyndemeyer/js-graphql-intellij-plugin#faq
+- If you're using an EAP, try with a stable version. If that works, please mention it in the issue along with both versions.
+
+## Version and Environment Details
+__Operation system__: 
+
+__IDE name and version__: 
+
+__Plugin version__: 
+
+## Expected Behaviour
+
+## Actual Behaviour
+
+## Steps to Reproduce / Link to Repo with Reproduction and Instructions

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.7.3 (2019-01-26)
+
+Fixes:
+
+- Fixed missing syntax highlighting colors due to uninitialized JavaScript colors being referenced from GraphQL (#158)
+- Set default charset to UTF-8 in query result viewer to align with JSON spec (#181)
+- Query result viewer doesn't always reformat the response JSON (#209)
+- Make the Query result viewer work with windows line endings in JSON responses (#191)
+
 ## 1.7.2 (2018-05-29)
 
 Fixes:

README.md

@@ -2,6 +2,8 @@
 
 # JS GraphQL IntelliJ Plugin
 
+__Note:__ V2.0 is in active development. See the [v2 branch](https://github.com/jimkyndemeyer/js-graphql-intellij-plugin/tree/v2) and [#164]( https://github.com/jimkyndemeyer/js-graphql-intellij-plugin/issues/164)
+
 GraphQL language support including Relay.QL tagged templates in JavaScript and TypeScript.
 
 It provides the following features in IntelliJ IDEA, WebStorm, RubyMine, PhpStorm, and PyCharm:
@@ -14,7 +16,41 @@ It provides the following features in IntelliJ IDEA, WebStorm, RubyMine, PhpStor
 - Configurable GraphQL schema retrieval and reloading based on a local file or a url using 'then-request'
 - Execute queries with variables against configurable endpoints
 
-It depends on [js-graphql-language-service](https://github.com/jimkyndemeyer/js-graphql-language-service) that it manages using a Node.js process handler.
+V1.x depends on [js-graphql-language-service](https://github.com/jimkyndemeyer/js-graphql-language-service) that it manages using a Node.js process handler.
+
+## Installation
+1. Install Node JS
+```
+# Ubuntu
+sudo apt install nodejs
+
+# Mac OS
+brew install node
+```
+
+2. Install Node JS and JS GraphQL Plugin in IntelliJ
+```
+1. File | Settings | Plugins
+2. Search for: nodejs and graphql
+3. Install both plugins and Restart
+```
+
+3. Set Node JS Interpreter in IntelliJ
+```
+1. File | Settings | Languages & Frameworks | Node.js and NPM Node interpreter 
+2. Add... (search for nodejs bin path in your system)
+
+# Ubuntu
+whereis nodejs
+/usr/bin/nodejs
+
+# Mac OS
+which node
+
+# Windows
+where node
+```
+At this point JS GraphQL will recognize your `.graphql` files. However, if you wish to customize your schema, follow the FAQ.
 
 ## Documentation
 

resources/META-INF/plugin.xml

@@ -34,6 +34,7 @@
       <li>2.0.0-alpha-4: Performance improvements, Relay Modern support, MarkDown documentation support, structure view, scratch files, recognize .graphqls, template placeholder support</li>
       <li>2.0.0-alpha-3: graphql-config support</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>
+      <li>1.7.3: Fixed missing syntax highlighting colors. Set default charset to UTF-8 in query result viewer. Support windows line endings in query result viewer and fixed reformat timing issue.</li>
     </ul>
     ]]>
   </change-notes>

src/main/com/intellij/lang/jsgraphql/endpoint/ide/search/JSGraphQLEndpointDefinitionsSearchExecutor.java

@@ -28,12 +28,12 @@
 public class JSGraphQLEndpointDefinitionsSearchExecutor implements QueryExecutor<PsiElement, PsiElement> {
 
     @Override
-    public boolean execute(@NotNull PsiElement queryParameters, @NotNull Processor<PsiElement> consumer) {
+    public boolean execute(@NotNull PsiElement queryParameters, @NotNull Processor<? super PsiElement> consumer) {
         ApplicationManager.getApplication().runReadAction((Computable) () -> JSGraphQLEndpointDefinitionsSearchExecutor.doExecute(queryParameters, consumer));
         return true;
     }
 
-    private static boolean doExecute(PsiElement sourceElement, final Processor<PsiElement> consumer) {
+    private static boolean doExecute(PsiElement sourceElement, final Processor<? super PsiElement> consumer) {
 
         // must be an interface definition with a named type to be applicable
         final Ref<JSGraphQLEndpointNamedTypeDef> sourceNamedTypeDef = new Ref<>();