Merge branch 'master' into Endpoint

jimmeyer-els · jimmeyer-els · commit 207915c00e12 · 2016-12-05T15:11:14.000+01:00
# Conflicts:
#	resources/META-INF/plugin.xml
#	test-resources/testData/ParsingTestData.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.4.4 (2016-11-28)
+
+Fixes:
+
+- Assertion failed: Caret model is in its update process. All requests are illegal at this point. (#42)
+
+## 1.4.3 (2016-10-30)
+
+Features:
+
+- Add GraphQL configuration page for indentation (#29)
+
+Fixes:
+
+- Language Service 1.3.2: Object literal for variables in getFragment closes Relay.QL template expression.
+
 ## 1.4.2 (2016-09-25)
 
 Features:
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -29,6 +29,8 @@
 
   <change-notes><![CDATA[
     <ul>
+      <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>
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/editor/JSGraphQLQueryContextHighlightVisitor.java b/src/main/com/intellij/lang/jsgraphql/ide/editor/JSGraphQLQueryContextHighlightVisitor.java
@@ -105,7 +105,7 @@ public void visit(@NotNull PsiElement element) {
     @Override
     public boolean analyze(final @NotNull PsiFile file, boolean updateWholeFile, @NotNull HighlightInfoHolder holder, @NotNull Runnable action) {
 
-        final PsiElement operationAtCursor = getOperationAtCursor(file);
+        final PsiElement operationAtCursor = getOperationAtCursor(file, null);
         if (operationAtCursor != null && hasMultipleVisibleTopLevelElement(file)) {
 
             // store the range of the current operation for use in the caret listener
@@ -172,7 +172,7 @@ public void caretPositionChanged(CaretEvent e) {
 
                                 if (!sameOperation) {
                                     // moved to somewhere outside the previous operation
-                                    if (hadOperation || getOperationAtCursor(psiFile) != null) {
+                                    if (hadOperation || getOperationAtCursor(psiFile, e) != null) {
                                         // perform a new highlighting pass
                                         DaemonCodeAnalyzer.getInstance(project).restart(psiFile);
                                     }
@@ -328,7 +328,7 @@ public static JSGraphQLQueryContext getQueryContextBufferAndHighlightUnused(fina
 
                 // no selection -- see if the caret is inside an operation
 
-                final PsiElement operationAtCursor = getOperationAtCursor(psiFile);
+                final PsiElement operationAtCursor = getOperationAtCursor(psiFile, null);
                 if (operationAtCursor != null) {
                     final HashSet<JSGraphQLFragmentDefinitionPsiElement> foundFragments = Sets.newHashSet();
                     findFragmentsInsideOperation(operationAtCursor, foundFragments, null);
@@ -439,11 +439,22 @@ private static void showQueryContextHint(Editor editor, String hintText) {
      * Gets the operation that wraps the current caret position, or <code>null</code> if none is found,
      * e.g. when outside any operation or inside a fragment definition
      */
-    private static PsiElement getOperationAtCursor(PsiFile psiFile) {
+    private static PsiElement getOperationAtCursor(PsiFile psiFile, CaretEvent caretEvent) {
         final FileEditor fileEditor = FileEditorManager.getInstance(psiFile.getProject()).getSelectedEditor(psiFile.getVirtualFile());
         if (fileEditor instanceof TextEditor) {
             final Editor editor = ((TextEditor) fileEditor).getEditor();
-            final int currentOffset = editor.getCaretModel().getOffset();
+            final int currentOffset;
+            if(caretEvent != null) {
+                currentOffset = editor.logicalPositionToOffset(caretEvent.getNewPosition());
+            } else {
+                try {
+                    currentOffset = editor.getCaretModel().getOffset();
+                } catch (Throwable e) {
+                    // a caret update is in progress, so can't determine the operation at this time,
+                    // but a new caretPositionChanged event will follow
+                    return null;
+                }
+            }
             PsiElement currentElement = psiFile.findElementAt(currentOffset);
             while (currentElement != null && !(currentElement.getParent() instanceof PsiFile)) {
                 currentElement = currentElement.getParent();
diff --git a/src/main/com/intellij/lang/jsgraphql/ide/formatter/JSGraphQLBlock.java b/src/main/com/intellij/lang/jsgraphql/ide/formatter/JSGraphQLBlock.java
@@ -117,6 +117,11 @@ public Indent getIndent() {
         if (NO_INDENT_ELEMENT_TYPES.contains(myNode.getElementType())) {
             return Indent.getNoneIndent();
         }
+        if(myNode.getElementType() == JSGraphQLTokenTypes.PUNCTUATION) {
+            if(",".equals(myNode.getText())) {
+                return Indent.getNormalIndent();
+            }
+        }
 
         if(parent != null) {
             JSGraphQLElementType astNode = getAstNode(parent);
diff --git a/src/main/com/intellij/lang/jsgraphql/languageservice/api/Token.java b/src/main/com/intellij/lang/jsgraphql/languageservice/api/Token.java
@@ -50,6 +50,16 @@ public void setKind(String kind) {
         this.kind = kind;
     }
 
+    public Token withTextAndOffset(String text, int offset) {
+        final Token token = new Token();
+        token.type = type;
+        token.text = text;
+        token.kind = kind;
+        token.start = start + offset;
+        token.end = token.start + text.length();
+        return token;
+    }
+
     @Override
     public String toString() {
         return "Token{" +
diff --git a/src/main/com/intellij/lang/jsgraphql/lexer/JSGraphQLCodeMirrorTokenMapper.java b/src/main/com/intellij/lang/jsgraphql/lexer/JSGraphQLCodeMirrorTokenMapper.java
@@ -18,12 +18,14 @@ public class JSGraphQLCodeMirrorTokenMapper {
 
     private final static Map<String, IElementType> mappings = Maps.newConcurrentMap();
 
+    public static final String CODEMIRROR_WHITESPACE = "ws";
+
     static {
         for (IElementType tokenType : JSGraphQLTokenTypes.ALL_TOKEN_TYPES) {
             if(tokenType instanceof JSGraphQLTokenType) {
                 mappings.put(((JSGraphQLTokenType)tokenType).getLexerTokenType(), tokenType);
             } else if(tokenType.equals(JSGraphQLTokenTypes.WHITESPACE)) {
-                mappings.put("ws", tokenType); // CodeMirror uses 'ws' for whitespace
+                mappings.put(CODEMIRROR_WHITESPACE, tokenType); // CodeMirror uses 'ws' for whitespace
             } else if(tokenType.equals(JSGraphQLTokenTypes.INVALIDCHAR)) {
                 mappings.put("invalidchar", tokenType); // CodeMirror uses 'invalidchar' for whitespace
             }
diff --git a/src/main/com/intellij/lang/jsgraphql/lexer/JSGraphQLLexer.java b/src/main/com/intellij/lang/jsgraphql/lexer/JSGraphQLLexer.java
@@ -18,6 +18,8 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.tree.IElementType;
+
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -99,6 +101,21 @@ private void fetchTokensFromLanguageService() {
                 final IElementType punctuationTokenType = getPunctuationTokenType(text);
                 if (punctuationTokenType != null) {
                     tokenType = punctuationTokenType;
+                } else if(text.contains(",")) {
+                    // separate out commas from surrounding whitespace to support indentation on ", field" lines
+                    int offset = 0;
+                    final String[] parts = StringUtils.splitByCharacterType(text);
+                    for (String part : parts) {
+                        final Token partSourceToken = token.withTextAndOffset(part, offset);
+                        if(part.equals(",")) {
+                            tokens.add(new JSGraphQLToken(tokenType, partSourceToken));
+                        } else {
+                            partSourceToken.setKind(JSGraphQLCodeMirrorTokenMapper.CODEMIRROR_WHITESPACE);
+                            tokens.add(new JSGraphQLToken(JSGraphQLTokenTypes.WHITESPACE, partSourceToken));
+                        }
+                        offset += part.length();
+                    }
+                    continue; // already added the required tokens
                 } else if (JSGraphQLKeywords.FRAGMENT_DOTS.equals(text)) {
                     // consider the "..." spread operator a keyword for highlighting
                     tokenType = JSGraphQLTokenTypes.KEYWORD;
diff --git a/test-resources/testData/FormatterExpectedResult.graphql b/test-resources/testData/FormatterExpectedResult.graphql
@@ -126,6 +126,17 @@ query queryName($foo: TestInput, $site: TestEnum = RED) {
     }
 }
 
+
+### comma before fields ###
+
+query Commas {
+    foo {
+        bar
+        , baz
+        , baz2
+    }
+}
+
 ### --------- annotations.graphql --------- ###
 
 type AnnotatedObject @foo(foo: {test: true}) {
diff --git a/test-resources/testData/FormatterTestData.graphql b/test-resources/testData/FormatterTestData.graphql
@@ -126,6 +126,17 @@ __typename
 }
 }
 
+
+### comma before fields ###
+
+query Commas {
+foo {
+bar
+, baz
+, baz2
+}
+}
+
 ### --------- annotations.graphql --------- ###
 
 type AnnotatedObject @foo(foo: {test: true}) {
diff --git a/test-resources/testData/ParsingTestData.txt b/test-resources/testData/ParsingTestData.txt
@@ -497,7 +497,8 @@ GraphQL File(0,2428)
           PsiElement(OPEN_QUOTE)('"')(1471,1472)
           PsiElement(STRING)('foo')(1472,1475)
           PsiElement(CLOSE_QUOTE)('"')(1475,1476)
-          PsiElement(PUNCTUATION)(', ')(1476,1478)
+          PsiElement(PUNCTUATION)(',')(1476,1477)
+          PsiWhiteSpace(' ')(1477,1478)
           JSGraphQLAttributePsiElement(Attribute)(1478,1484)
             PsiElement(ATTRIBUTE)('option')(1478,1484)
           PsiElement(PUNCTUATION)(':')(1484,1485)
@@ -584,7 +585,8 @@ GraphQL File(0,2428)
       PsiWhiteSpace(' ')(1734,1735)
       JSGraphQLNamedTypePsiElement(Atom)(1735,1744)
         PsiElement(ATOM)('TestInput')(1735,1744)
-      PsiElement(PUNCTUATION)(', ')(1744,1746)
+      PsiElement(PUNCTUATION)(',')(1744,1745)
+      PsiWhiteSpace(' ')(1745,1746)
       PsiElement(VARIABLE)('$')(1746,1747)
       PsiElement(VARIABLE)('site')(1747,1751)
       PsiElement(PUNCTUATION)(':')(1751,1752)
@@ -644,9 +646,11 @@ GraphQL File(0,2428)
               JSGraphQLPsiElement(ListValue)(1869,1887)
                 PsiElement(LBRACKET)('[')(1869,1870)
                 PsiElement(<UNKNOWN>)('RED')(1870,1873)
-                PsiElement(PUNCTUATION)(', ')(1873,1875)
+                PsiElement(PUNCTUATION)(',')(1873,1874)
+                PsiWhiteSpace(' ')(1874,1875)
                 PsiElement(<UNKNOWN>)('GREEN')(1875,1880)
-                PsiElement(PUNCTUATION)(', ')(1880,1882)
+                PsiElement(PUNCTUATION)(',')(1880,1881)
+                PsiWhiteSpace(' ')(1881,1882)
                 PsiElement(<UNKNOWN>)('BLUE')(1882,1886)
                 PsiElement(RBRACKET)(']')(1886,1887)
             PsiWhiteSpace('\n')(1887,1888)
@@ -666,9 +670,11 @@ GraphQL File(0,2428)
               JSGraphQLPsiElement(ListValue)(1922,1949)
                 PsiElement(LBRACKET)('[')(1922,1923)
                 PsiElement(NUMBER)('1.23')(1923,1927)
-                PsiElement(PUNCTUATION)(', ')(1927,1929)
+                PsiElement(PUNCTUATION)(',')(1927,1928)
+                PsiWhiteSpace(' ')(1928,1929)
                 PsiElement(NUMBER)('1.3e-1')(1929,1935)
-                PsiElement(PUNCTUATION)(', ')(1935,1937)
+                PsiElement(PUNCTUATION)(',')(1935,1936)
+                PsiWhiteSpace(' ')(1936,1937)
                 PsiElement(NUMBER)('-1.35384e+3')(1937,1948)
                 PsiElement(RBRACKET)(']')(1948,1949)
             PsiWhiteSpace('\n')(1949,1950)
@@ -842,7 +848,8 @@ GraphQL File(0,2428)
           PsiElement(OPEN_QUOTE)('"')(2340,2341)
           PsiElement(STRING)('test')(2341,2345)
           PsiElement(CLOSE_QUOTE)('"')(2345,2346)
-          PsiElement(PUNCTUATION)(', ')(2346,2348)
+          PsiElement(PUNCTUATION)(',')(2346,2347)
+          PsiWhiteSpace(' ')(2347,2348)
           JSGraphQLArgumentPsiElement(Argument)(2348,2365)
             JSGraphQLAttributePsiElement(Attribute)(2348,2351)
               PsiElement(ATTRIBUTE)('foo')(2348,2351)
