Include __typename in field completion (#164)

Author: jimkyndemeyer

src/main/com/intellij/lang/jsgraphql/ide/completion/GraphQLCompletionContributor.java

@@ -182,6 +182,9 @@ protected void addCompletions(@NotNull final CompletionParameters parameters, Pr
                 @Override
                 protected void addCompletions(@NotNull final CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) {
 
+                    // move "__*" fields to bottom
+                    final CompletionResultSet orderedResult = updateResult(parameters, result);
+
                     final PsiElement completionElement = Optional.ofNullable(parameters.getOriginalPosition()).orElse(parameters.getPosition());
 
                     GraphQLTypeScopeProvider typeScopeProvider = PsiTreeUtil.getParentOfType(completionElement, GraphQLTypeScopeProvider.class);
@@ -234,14 +237,16 @@ protected void addCompletions(@NotNull final CompletionParameters parameters, Pr
                                             break;
                                         }
                                     }
-                                    result.addElement(element);
+                                    orderedResult.addElement(element);
                                 });
                             }
                             if (!(typeScopeProvider instanceof GraphQLOperationDefinition)) {
                                 // show the '...' except when top level selection in an operation
-                                result.addElement(LookupElementBuilder.create("...").withInsertHandler((ctx, item) -> {
+                                orderedResult.addElement(LookupElementBuilder.create("...").withInsertHandler((ctx, item) -> {
                                     AutoPopupController.getInstance(ctx.getProject()).autoPopupMemberLookup(ctx.getEditor(), null);
                                 }));
+                                // and add the built-in __typename option
+                                orderedResult.addElement(LookupElementBuilder.create("__typename"));
                             }
                         }
                     }
@@ -1079,7 +1084,7 @@ public int compareTo(LookupElementComparator other) {
         }
 
         private String getSortText(LookupElement element) {
-            if (element.getLookupString().startsWith("__")) {
+            if (element.getLookupString().startsWith("__") || element.getLookupString().startsWith("...")) {
                 return "|" + element.getLookupString();
             }
             return element.getLookupString();

src/test/com/intellij/lang/jsgraphql/operations/JSGraphQLOperationsCodeInsightTest.java

@@ -99,7 +99,7 @@ public void testCompletionNestedFieldArg3() {
 
     @Test
     public void testCompletionFieldExtension() {
-        doTestCompletion("CompletionFieldExtension.graphql", Lists.newArrayList("...", "enumField", "extended", "fieldWithArg", "fieldWithInput", "id", "name", "search"));
+        doTestCompletion("CompletionFieldExtension.graphql", Lists.newArrayList("enumField", "extended", "fieldWithArg", "fieldWithInput", "id", "name", "search", "...", "__typename"));
     }
 
 
@@ -112,7 +112,7 @@ public void testCompletionFragmentDefinition() {
 
     @Test
     public void testCompletionFragmentField() {
-        doTestCompletion("CompletionFragmentField.graphql", Lists.newArrayList("...", "id"));
+        doTestCompletion("CompletionFragmentField.graphql", Lists.newArrayList("id", "...", "__typename"));
     }
 
     @Test