Merge branch 'issue-35-arguments' into Endpoint

# Conflicts:
#	resources/META-INF/plugin.xml
#	src/main/com/intellij/lang/jsgraphql/schema/ide/project/JSGraphQLSchemaLanguageProjectService.java

Author: jimmeyer-els

resources/META-INF/plugin.xml

@@ -132,6 +132,7 @@
     <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" />
+    <enterHandlerDelegate implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLEnterInEmptyListHandler"/>
     <langCodeStyleSettingsProvider implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLLanguageCodeStyleSettingsProvider"/>
     <codeStyleSettingsProvider implementation="com.intellij.lang.jsgraphql.ide.formatter.JSGraphQLCodeStyleSettingsProvider" />
 

src/main/com/intellij/lang/jsgraphql/ide/documentation/JSGraphQLDocumentationProvider.java

@@ -14,6 +14,7 @@
 import com.intellij.lang.jsgraphql.languageservice.JSGraphQLNodeLanguageServiceClient;
 import com.intellij.lang.jsgraphql.languageservice.api.TokenDocumentationResponse;
 import com.intellij.lang.jsgraphql.languageservice.api.TypeDocumentationResponse;
+import com.intellij.lang.jsgraphql.psi.JSGraphQLAttributePsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLFragmentDefinitionPsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLNamedPropertyPsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLNamedPsiElement;
@@ -24,10 +25,12 @@
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.GuiUtils;
 import com.intellij.util.containers.ContainerUtil;
@@ -197,6 +200,27 @@ private String createQuickNavigateDocumentation(PsiElement element, boolean full
                     doc += "</code>";
                     return getDocTemplate(fullDocumentation).replace("${body}", doc);
                 }
+            } else if(element instanceof JSGraphQLAttributePsiElement) {
+                String doc = "";
+                PsiElement prevLeaf = PsiTreeUtil.prevLeaf(element);
+                String documentation = "";
+                while (prevLeaf instanceof PsiWhiteSpace || prevLeaf instanceof PsiComment) {
+                    documentation = StringUtils.removeStart(prevLeaf.getText(), "# ") + documentation;
+                    prevLeaf = PsiTreeUtil.prevLeaf(prevLeaf);
+                }
+                documentation = documentation.trim();
+                if(StringUtils.isNotBlank(documentation)) {
+                    doc += "<div style=\"margin-bottom: 4px\">" + StringEscapeUtils.escapeHtml(documentation) + "</div>";
+                }
+                doc += "<code>"  + element.getText();
+                PsiElement nextLeaf = PsiTreeUtil.nextLeaf(element);
+                // include the attribute type (stopping at newline, ",", and ")")
+                while(nextLeaf != null && !nextLeaf.getText().contains("\n") && !nextLeaf.getText().contains(",") && !nextLeaf.getText().contains(")")) {
+                    doc += nextLeaf.getText();
+                    nextLeaf = PsiTreeUtil.nextLeaf(nextLeaf);
+                }
+                doc += "</code>";
+                return getDocTemplate(fullDocumentation).replace("${body}", doc);
             }
 
         }

src/main/com/intellij/lang/jsgraphql/ide/editor/JSGraphQLFoldingBuilder.java

@@ -24,6 +24,11 @@ public class JSGraphQLFoldingBuilder implements FoldingBuilder {
     @Nullable
     @Override
     public String getPlaceholderText(@NotNull ASTNode node) {
+        final ASTNode first = node.getFirstChildNode();
+        final ASTNode last = node.getLastChildNode();
+        if (first != null && last != null) {
+            return first.getText() + "..." + last.getText();
+        }
         return "{...}";
     }
 

src/main/com/intellij/lang/jsgraphql/ide/findUsages/JSGraphQLFindUsagesProvider.java

@@ -9,13 +9,18 @@
 
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.lang.findUsages.FindUsagesProvider;
+import com.intellij.lang.jsgraphql.JSGraphQLKeywords;
+import com.intellij.lang.jsgraphql.psi.JSGraphQLAttributePsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLNamedPropertyPsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLNamedPsiElement;
 import com.intellij.lang.jsgraphql.psi.JSGraphQLNamedTypePsiElement;
+import com.intellij.lang.jsgraphql.psi.JSGraphQLPsiElement;
 import com.intellij.lang.jsgraphql.schema.psi.JSGraphQLSchemaFile;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
+import com.intellij.psi.util.PsiTreeUtil;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -52,6 +57,22 @@ public String getType(@NotNull PsiElement element) {
             final boolean atom = element.getContainingFile() instanceof JSGraphQLSchemaFile || ((JSGraphQLNamedTypePsiElement) element).isAtom();
             return atom ? "type" : "definition";
         }
+        if(element instanceof JSGraphQLAttributePsiElement) {
+            JSGraphQLPsiElement parent = PsiTreeUtil.getParentOfType(element, JSGraphQLPsiElement.class);
+            while (parent != null) {
+                final JSGraphQLPsiElement ancestor = PsiTreeUtil.getParentOfType(parent, JSGraphQLPsiElement.class);
+                if(ancestor == null) {
+                    break;
+                }
+                parent = ancestor;
+            }
+            if(parent != null && JSGraphQLKeywords.INPUT.equals(parent.getKeyword())) {
+                // field of an input type
+                return "input field";
+            }
+            // field argument
+            return "argument";
+        }
         return "unknown";
     }
 

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

@@ -19,6 +19,7 @@
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.formatter.common.AbstractBlock;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,6 +41,15 @@ public class JSGraphQLBlock extends AbstractBlock {
             EXTEND_DEF_KIND
     );
 
+    private static final Set<IElementType> NO_INDENT_ELEMENT_TYPES = Sets.newHashSet(
+            JSGraphQLTokenTypes.LBRACE,
+            JSGraphQLTokenTypes.RBRACE,
+            JSGraphQLTokenTypes.LBRACKET,
+            JSGraphQLTokenTypes.RBRACKET,
+            JSGraphQLTokenTypes.LPAREN,
+            JSGraphQLTokenTypes.RPAREN
+    );
+
     @Nullable
     private JSGraphQLBlock parent;
     private SpacingBuilder spacingBuilder;
@@ -104,18 +114,31 @@ private JSGraphQLElementType getAstNode(JSGraphQLBlock block) {
     @Override
     public Indent getIndent() {
 
-        if (myNode.getElementType() == JSGraphQLTokenTypes.RBRACE || myNode.getElementType() == JSGraphQLTokenTypes.LBRACE) {
+        if (NO_INDENT_ELEMENT_TYPES.contains(myNode.getElementType())) {
             return Indent.getNoneIndent();
         }
 
         if(parent != null) {
             JSGraphQLElementType astNode = getAstNode(parent);
             if (astNode != null) {
-                if (JSGraphQLElementType.SELECTION_SET_KIND.equals(astNode.getKind())) {
+                final String kind = astNode.getKind();
+                if (JSGraphQLElementType.SELECTION_SET_KIND.equals(kind)) {
                     // this block is inside a selection set: '{ ... }', so indent it
                     return Indent.getNormalIndent();
                 }
-                if(JSGraphQLElementType.SCHEMA_DEF_KIND.equals(astNode.getKind())) {
+                if (JSGraphQLElementType.ARGUMENTS_KIND.equals(kind)) {
+                    // this block is inside a () arguments list, so indent it
+                    return Indent.getNormalIndent();
+                }
+                if (JSGraphQLElementType.OBJECT_VALUE_KIND.equals(kind)) {
+                    // this block is inside a {} object value, so indent it
+                    return Indent.getNormalIndent();
+                }
+                if (JSGraphQLElementType.LIST_VALUE_KIND.equals(kind)) {
+                    // this block is inside a [] list value, so indent it
+                    return Indent.getNormalIndent();
+                }
+                if(JSGraphQLElementType.SCHEMA_DEF_KIND.equals(kind)) {
                     // inside schema {}
                     if(myNode.getText().equals(JSGraphQLKeywords.QUERY) || myNode.getText().equals(JSGraphQLKeywords.MUTATION) || myNode.getText().equals(JSGraphQLKeywords.SUBSCRIPTION)) {
                         return Indent.getNormalIndent();
@@ -124,7 +147,7 @@ public Indent getIndent() {
                         return Indent.getNormalIndent();
                     }
                 }
-                if(myNode.getElementType() != JSGraphQLTokenTypes.KEYWORD && INDENT_PARENT_KINDS.contains(astNode.getKind())) {
+                if(myNode.getElementType() != JSGraphQLTokenTypes.KEYWORD && INDENT_PARENT_KINDS.contains(kind)) {
                     // properties inside schema definitions
                     return Indent.getNormalIndent();
                 }

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

@@ -0,0 +1,42 @@
+/**
+ * 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.codeInsight.editorActions.enter.EnterBetweenBracesHandler;
+import com.intellij.lang.jsgraphql.JSGraphQLLanguage;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
+import com.intellij.openapi.util.Ref;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Adds a new indented line when pressing enter between [] in an empty GraphQL list
+ */
+public class JSGraphQLEnterInEmptyListHandler extends EnterBetweenBracesHandler {
+
+    @Override
+    public Result preprocessEnter(@NotNull PsiFile file,
+                                  @NotNull Editor editor,
+                                  @NotNull Ref<Integer> caretOffsetRef,
+                                  @NotNull Ref<Integer> caretAdvance,
+                                  @NotNull DataContext dataContext,
+                                  EditorActionHandler originalHandler) {
+        if (!file.getLanguage().is(JSGraphQLLanguage.INSTANCE)) {
+            return Result.Continue;
+        }
+        return super.preprocessEnter(file, editor, caretOffsetRef, caretAdvance, dataContext, originalHandler);
+    }
+
+    @Override
+    protected boolean isBracePair(char c1, char c2) {
+        return c1 == '[' && c2 == ']';
+    }
+
+}