Merged schema-language branch to master (#3)

Author: jimkyndemeyer

DEVELOPING.md

@@ -4,6 +4,7 @@
 - Add all jars in `<intellij home>/plugins/JavaScriptLanguage`
 - Add the NodeNS.jar in `<user home>/.IntelliJIdea15/config/plugins/NodeJS/lib`
 - Add the IntelliLang.jar in `<user home>/.IntelliJIdea15/config/plugins/IntelliLang/lib`
+- Add the netty-all-*.jar in `<intellij home>/lib` 
 
 ## Setting up Intellij Community (OpenApi) sources:
 - https://github.com/JetBrains/intellij-plugins/tree/master/Dart

README.md

@@ -6,10 +6,12 @@ GraphQL language support including Relay.QL tagged templates in JavaScript and T
 
 It provides the following features in IntelliJ IDEA, WebStorm, RubyMine, PhpStorm, and PyCharm:
 
-- Schema-aware completion and error highlighting
+- Schema-aware completion, error highlighting, and documentation
 - Syntax highlighting, code-formatting, folding, commenter, and brace-matching
+- 'Find Usages' and 'Go to Declaration' for schema types and fields
+- Schema viewer and 'Go to Implementation' for schema interfaces
+- 'Structure view' to navigate GraphQL and GraphQL Schema files
 - Configurable GraphQL schema retrieval and reloading based on a local file or a url using 'then-request'
-- View and browse the schema documentation in-editor using Ctrl/Cmd+Click or the documentation tool window
 - 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.

resources/META-INF/plugin.xml

@@ -10,17 +10,19 @@
 <idea-plugin version="2">
   <id>com.intellij.lang.jsgraphql</id>
   <name>JS GraphQL</name>
-  <version>1.0.0</version>
+  <version>1.1.0</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 and error highlighting</li>
+        <li>Schema-aware completion, error highlighting, and documentation</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>View and browse the schema documentation in-editor using Ctrl/Cmd+Click or the documentation tool window</li>
         <li>Execute queries with variables against configurable endpoints</li>
       </ul>
     ]]></description>
@@ -44,20 +46,32 @@
 
   <extensions defaultExtensionNs="com.intellij">
 
-    <!-- Project Language service -->
+    <!-- Project Language services -->
     <projectService serviceInterface="com.intellij.lang.jsgraphql.ide.project.JSGraphQLLanguageUIProjectService" serviceImplementation="com.intellij.lang.jsgraphql.ide.project.JSGraphQLLanguageUIProjectService" />
+    <projectService serviceInterface="com.intellij.lang.jsgraphql.schema.ide.project.JSGraphQLSchemaLanguageProjectService" serviceImplementation="com.intellij.lang.jsgraphql.schema.ide.project.JSGraphQLSchemaLanguageProjectService" />
+    <projectService serviceInterface="com.intellij.lang.jsgraphql.ide.configuration.JSGraphQLConfigurationProvider" serviceImplementation="com.intellij.lang.jsgraphql.ide.configuration.JSGraphQLConfigurationProvider" />
 
-    <!-- File type -->
+
+    <!-- Project tree -->
+    <treeStructureProvider implementation="com.intellij.lang.jsgraphql.schema.ide.project.JSGraphQLSchemaTreeStructureProvider" />
+
+
+    <!-- File types -->
     <fileTypeFactory implementation="com.intellij.lang.jsgraphql.JSGraphQLFileTypeFactory"/>
+    <fileTypeFactory implementation="com.intellij.lang.jsgraphql.schema.JSGraphQLSchemaFileTypeFactory"/>
     <internalFileTemplate name="GraphQL File"/>
 
 
     <!-- Language -->
     <lang.parserDefinition language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.JSGraphQLParserDefinition"/>
+    <lang.parserDefinition language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.schema.JSGraphQLSchemaParserDefinition"/>
     <lang.syntaxHighlighterFactory language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.highlighting.JSGraphQLSyntaxHighlighterFactory"/>
+    <lang.syntaxHighlighterFactory language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.ide.highlighting.JSGraphQLSyntaxHighlighterFactory"/>
     <lang.commenter language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLCommenter"/>
     <lang.braceMatcher language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLBraceMatcher"  />
-
+    <lang.fileViewProviderFactory language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.schema.psi.JSGraphQLSchemaFileViewProviderFactory" />
+    <lang.psiStructureViewFactory language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.structureView.JSGraphQLPsiStructureViewFactory"/>
+    <lang.psiStructureViewFactory language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.ide.structureView.JSGraphQLPsiStructureViewFactory"/>
 
     <!-- Completion -->
     <completion.contributor language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.completion.JSGraphQLCompletionContributor"/>
@@ -67,21 +81,33 @@
     <externalAnnotator language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLAnnotator" />
     <externalAnnotator language="JavaScript" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLAnnotator" />
     <externalAnnotator language="TypeScript" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLAnnotator" /><!-- Own reg required -->
-    <annotator language="JSX Harmony" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLRelayTemplateAnnotator" />
-    <annotator language="TypeScript JSX" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLRelayTemplateAnnotator" />
+    <annotator language="JavaScript" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLRelayTemplateAnnotator" /><!-- Using the JSX dialect overwrites the default annotator -->
+    <annotator language="TypeScript" implementationClass="com.intellij.lang.jsgraphql.ide.annotator.JSGraphQLRelayTemplateAnnotator" /><!-- Using the JSX dialect overwrites the default annotator -->
 
 
     <!-- Formatting -->
     <lang.formatter language="GraphQL"    implementationClass="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLFormattingModelBuilder"/>
     <lang.formatter language="JavaScript" implementationClass="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLInjectedFormattingModelBuilder" />
     <lang.formatter language="TypeScript" implementationClass="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLInjectedFormattingModelBuilder" /><!-- Own reg required -->
     <lang.foldingBuilder language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLFoldingBuilder"/>
+    <lang.foldingBuilder language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLFoldingBuilder"/>
     <lang.quoteHandler language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLQuoteHandler" />
     <enterHandlerDelegate implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLEnterHandlerDelegate" />
 
 
+    <!-- Find usages -->
+    <lang.findUsagesProvider language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.findUsages.JSGraphQLFindUsagesProvider" />
+    <usageTypeProvider implementation="com.intellij.lang.jsgraphql.ide.findUsages.JSGraphQLUsageTypeProvider" />
+    <findUsagesHandlerFactory id="GraphQL" implementation="com.intellij.lang.jsgraphql.ide.findUsages.JSGraphQLFindUsagesHandlerFactory"/>
+
+
+    <!-- Renaming -->
+    <vetoRenameCondition implementation="com.intellij.lang.jsgraphql.ide.rename.JSGraphQLRenameVetoCondition" />
+
+    
     <!-- Schema documentation -->
     <lang.documentationProvider language="GraphQL" implementationClass="com.intellij.lang.jsgraphql.ide.documentation.JSGraphQLDocumentationProvider" />
+    <lang.documentationProvider language="GraphQL Schema" implementationClass="com.intellij.lang.jsgraphql.ide.documentation.JSGraphQLDocumentationProvider" />
     <!-- Note: JSX/TSX documentation providers are registered in their base language (JS), so we do the same to not take over the entire doc impl -->
     <lang.documentationProvider language="JavaScript" implementationClass="com.intellij.lang.jsgraphql.ide.documentation.JSGraphQLDocumentationProvider" />
 
@@ -102,6 +128,11 @@
     <!-- Query execution (see com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_SPLIT which is ctrl+enter by default) -->
     <editorActionHandler action="EditorSplitLine" implementationClass="com.intellij.lang.jsgraphql.ide.actions.JSGraphQLExecuteEditorActionHandler" order="first" />
     <highlightErrorFilter implementation="com.intellij.lang.jsgraphql.ide.editor.JSGraphQLVariablesHighlightErrorFilter" />
+
+
+    <!-- Search (find implementations etc.) -->
+    <definitionsSearch implementation="com.intellij.lang.jsgraphql.schema.ide.search.JSGraphQLDefinitionsSearchExecutor"/>
+
   </extensions>
 
   <actions>

src/main/com/intellij/lang/jsgraphql/JSGraphQLFileTypeFactory.java

@@ -11,9 +11,9 @@
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
 
-public class JSGraphQLFileTypeFactory extends FileTypeFactory{
+public class JSGraphQLFileTypeFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer fileTypeConsumer) {
-        fileTypeConsumer.consume(JSGraphQLFileType.INSTANCE, "graphql");
+        fileTypeConsumer.consume(JSGraphQLFileType.INSTANCE, JSGraphQLFileType.INSTANCE.getDefaultExtension());
     }
 }

src/main/com/intellij/lang/jsgraphql/JSGraphQLKeywords.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015, Jim Kynde Meyer
+ * All rights reserved.
+ *
+ * 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;
+
+public interface JSGraphQLKeywords {
+
+    // graphql
+    String QUERY = "query";
+    String FRAGMENT = "fragment";
+    String FRAGMENT_DOTS = "...";    
+    String FRAGMENT_ON = "on";
+    String MUTATION = "mutation";
+    String SUBSCRIPTION = "subscription";
+    
+    // graphql schema
+    String TYPE = "type";
+    String INTERFACE = "interface";
+    String UNION = "union";
+    String SCALAR = "scalar";
+    String ENUM = "enum";
+    String INPUT = "input";
+    String EXTEND = "extend";
+    
+    
+}

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

@@ -20,6 +20,7 @@ public static class Logos {
 
     public static class Files {
         public static final Icon GraphQL = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/graphql-file.png");
+        public static final Icon GraphQLSchema = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/graphql-schema-file.png");
     }
 
     public static class UI {
@@ -30,7 +31,14 @@ public static class UI {
     public static class Schema {
         public static final Icon Field = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/field.png");
         public static final Icon Scalar = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/scalar.png");
+        public static final Icon Enum = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/enum.png");
         public static final Icon Type = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/type.png");
+        public static final Icon Interface = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/interface.png");
+        public static final Icon Query = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/query.png");
+        public static final Icon Attribute = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/attribute.png");
+        public static final Icon Subscription = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/subscription.png");
+        public static final Icon Mutation = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/mutation.png");
+        public static final Icon Fragment = JSGraphQLIcons.load("/com/intellij/lang/jsgraphql/icons/fragment.png");
     }
 
     private static Icon load(String path) {