Merge branch 'master' into Endpoint

# Conflicts:
#	resources/META-INF/plugin.xml

Author: jimmeyer-els

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.4.2 (2016-09-25)
+
+Features:
+
+- Language Service 1.3.1: Support __schema root in schema.json (compatible with graphene)
+
+Changes:
+
+- Fixes formatting exception when using ".if" live template in JSFile with injected GraphQL (#26)
+
 ## 1.4.1 (2016-09-11)
 
 Features:

README.md

@@ -42,6 +42,12 @@ To install it, open "Settings", "Plugins", "Browse repositories..." and search f
 
 **Note**: The experimental version in the `android-studio` branch is not available from the JetBrains Plugin Repository.
 
+**How do I configure the plugin in a project**
+
+The plugin is activated as soon as you view or edit GraphQL in the editor. This includes GraphQL inside `Relay.QL` and `gql` templates in JavaScript and TypeScript. You can also use `.graphql` physical files and scratch files. These files allow you to query your endpoint directly from your IDE.
+
+An editor notification bar should prompt you to "Create a graphql.config.json". Accept and edit this config file to point the plugin at your local `schema.json` or your endpoint for introspection. The plugin uses the schema to provide completion and error highlighting.
+
 **How do I reload a GraphQL Schema that was loaded from a URL?**
 
 In the the GraphQL tool window, select the "Current Errors" tab and click the "Restart JS GraphQL Language Service" button. 

resources/META-INF/plugin.xml

@@ -29,6 +29,7 @@
 
   <change-notes><![CDATA[
     <ul>
+      <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>
@@ -131,6 +132,8 @@
     <lang.quoteHandler language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLQuoteHandler" />
     <lang.quoteHandler language="GraphQL Endpoint" implementationClass="com.intellij.lang.jsgraphql.endpoint.ide.editor.JSGraphQLEndpointQuoteHandler" />
     <enterHandlerDelegate implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLEnterHandlerDelegate" />
+    <langCodeStyleSettingsProvider implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLLanguageCodeStyleSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLCodeStyleSettingsProvider" />
 
 
     <!-- Find usages -->

src/main/com/intellij/lang/jsgraphql/ide/formatter/JSGraphQLCodeStyleSettingsProvider.java

@@ -51,5 +51,14 @@ private static class JSGraphQLCodeStyleMainPanel extends TabbedLanguageCodeStyle
         public JSGraphQLCodeStyleMainPanel(CodeStyleSettings currentSettings, CodeStyleSettings settings) {
             super(JSGraphQLLanguage.INSTANCE, currentSettings, settings);
         }
+
+        @Override
+        protected void addSpacesTab(CodeStyleSettings settings) {}
+
+        @Override
+        protected void addBlankLinesTab(CodeStyleSettings settings) {}
+
+        @Override
+        protected void addWrappingAndBracesTab(CodeStyleSettings settings) {}
     }
 }

src/main/com/intellij/lang/jsgraphql/ide/formatter/JSGraphQLLanguageCodeStyleSettingsProvider.java

@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2015-present, Jim Kynde Meyer
+ * All rights reserved.
+ * <p>
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+package com.intellij.lang.jsgraphql.ide.formatter;
+
+import com.intellij.application.options.IndentOptionsEditor;
+import com.intellij.lang.Language;
+import com.intellij.lang.jsgraphql.JSGraphQLLanguage;
+import com.intellij.openapi.application.ApplicationBundle;
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
+import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+
+public class JSGraphQLLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
+
+    @NotNull
+    @Override
+    public Language getLanguage() {
+        return JSGraphQLLanguage.INSTANCE;
+    }
+
+    @Nullable
+    @Override
+    public CommonCodeStyleSettings getDefaultCommonSettings() {
+        final CommonCodeStyleSettings defaultSettings = new CommonCodeStyleSettings(getLanguage());
+        CommonCodeStyleSettings.IndentOptions indentOptions = defaultSettings.initIndentOptions();
+        indentOptions.INDENT_SIZE = 4;
+        indentOptions.USE_TAB_CHARACTER = false;
+        return defaultSettings;
+    }
+
+    @Nullable
+    @Override
+    public IndentOptionsEditor getIndentOptionsEditor() {
+        return new IndentOptionsEditor() {
+            protected void addComponents() {
+                addTabOptions();
+                myTabSizeField = new JTextField();
+                myTabSizeLabel = new JLabel();
+                myIndentField = createIndentTextField();
+                myIndentLabel = new JLabel(ApplicationBundle.message("editbox.indent.indent"));
+                add(myIndentLabel, myIndentField);
+            }
+
+            protected void addTabOptions() {
+                myCbUseTab = new JCheckBox("");
+            }
+        };
+    }
+
+    @Override
+    public String getCodeSample(@NotNull SettingsType settingsType) {
+        return "query MyQuery {\n" +
+                "    __schema {\n" +
+                "        types {\n" +
+                "            ...FullType\n" +
+                "        }\n" +
+                "    }\n" +
+                "}\n" +
+                "\n" +
+                "fragment FullType on __Type {\n" +
+                "    # Note: __Type has a lot more fields than this\n" +
+                "    name\n" +
+                "}\n" +
+                "\n" +
+                "mutation MyMutation($input: MyInput!) {\n" +
+                "    # Payload\n" +
+                "}\n";
+    }
+}

src/main/com/intellij/lang/jsgraphql/ide/highlighting/JSGraphQLSyntaxHighlighterFactory.java

@@ -8,17 +8,28 @@
 package com.intellij.lang.jsgraphql.ide.highlighting;
 
 import com.intellij.lang.jsgraphql.schema.JSGraphQLSchemaFileType;
+import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 public class JSGraphQLSyntaxHighlighterFactory extends SyntaxHighlighterFactory {
     @NotNull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter(Project project, VirtualFile virtualFile) {
-        final boolean schema = virtualFile.getFileType() == JSGraphQLSchemaFileType.INSTANCE;
+        final boolean schema = virtualFile != null && virtualFile.getFileType() == JSGraphQLSchemaFileType.INSTANCE;
+        if(project == null) {
+            Project[] openProjects = ProjectManager.getInstance().getOpenProjects();
+            if(openProjects.length > 0) {
+                project = openProjects[0];
+            } else {
+                // can't syntax highlight GraphQL without a project to associate the language service instance to
+                return new PlainSyntaxHighlighter();
+            }
+        }
         return new JSGraphQLSyntaxHighlighter(project, schema);
     }
 }