Code complete default query variables (#516)

apollographql · Jul 27, 2018 · a17aeea · a17aeea
1 parent 42635af
commit a17aeea
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 73 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/apollo-language-server/package.json b/packages/apollo-language-server/package.json
@@ -28,7 +28,7 @@
     "core-js": "^2.5.7",
     "glob": "^7.1.2",
     "graphql": "^0.13.1",
-    "graphql-language-service-server": "^1.1.2",
+    "@apollographql/graphql-language-service-interface": "1.3.2",
     "graphql-tag": "^2.9.2",
     "minimatch": "^3.0.4",
     "moment": "^2.22.2",

diff --git a/packages/apollo-language-server/src/document.ts b/packages/apollo-language-server/src/document.ts
@@ -8,7 +8,7 @@ import {
   DiagnosticSeverity
 } from "vscode-languageserver";
 
-import { getRange as rangeOfTokenAtLocation } from "graphql-language-service-interface/dist/getDiagnostics";
+import { getRange as rangeOfTokenAtLocation } from "@apollographql/graphql-language-service-interface/dist/getDiagnostics";
 
 import {
   positionFromSourceLocation,

diff --git a/packages/apollo-language-server/src/languageProvider.ts b/packages/apollo-language-server/src/languageProvider.ts
@@ -11,11 +11,11 @@ import {
   InsertTextFormat
 } from "vscode-languageserver";
 
-import { getAutocompleteSuggestions } from "graphql-language-service-interface";
+import { getAutocompleteSuggestions } from "@apollographql/graphql-language-service-interface";
 import {
   getTokenAtPosition,
   getTypeInfo
-} from "graphql-language-service-interface/dist/getAutocompleteSuggestions";
+} from "@apollographql/graphql-language-service-interface/dist/getAutocompleteSuggestions";
 
 import { GraphQLWorkspace } from "./workspace";
 import { DocumentUri, GraphQLProject } from "./project";
@@ -114,6 +114,7 @@ export class GraphQLLanguageProvider {
         doc.source.body,
         positionInDocument
       ).map(suggest => {
+        // when code completing fields, expand out required variables and open braces
         const suggestedField = parentFields[suggest.label] as GraphQLField<
           void,
           void
@@ -203,8 +204,12 @@ export class GraphQLLanguageProvider {
           const fieldDef = typeInfo.getFieldDef();
 
           if (parentType && fieldDef) {
-            const argsString = fieldDef.args.length > 0 ?
-              `(${fieldDef.args.map(a => `${a.name}: ${a.type}`).join(", ")})` : "";
+            const argsString =
+              fieldDef.args.length > 0
+                ? `(${fieldDef.args
+                    .map(a => `${a.name}: ${a.type}`)
+                    .join(", ")})`
+                : "";
             return {
               contents: `
 \`\`\`graphql
@@ -220,7 +225,9 @@ ${fieldDef.description}
         }
 
         case Kind.NAMED_TYPE: {
-          const type = set.schema.getType(node.name.value) as GraphQLNamedType | void;
+          const type = set.schema.getType(
+            node.name.value
+          ) as GraphQLNamedType | void;
           if (!type) break;
 
           return {
@@ -244,7 +251,7 @@ ${argumentNode.name}: ${argumentNode.type}
 ${argumentNode.description}
 `,
             range: rangeForASTNode(highlightNodeForNode(node))
-          }
+          };
         }
       }
     }
@@ -390,7 +397,9 @@ ${argumentNode.description}
       for (const definition of doc.ast.definitions) {
         if (definition.kind === Kind.OPERATION_DEFINITION) {
           if (set.endpoint) {
-            const fragmentSpreads: Set<graphql.FragmentDefinitionNode> = new Set();
+            const fragmentSpreads: Set<
+              graphql.FragmentDefinitionNode
+            > = new Set();
             const searchForReferencedFragments = (node: graphql.ASTNode) => {
               visit(node, {
                 FragmentSpread(node: FragmentSpreadNode) {
@@ -413,10 +422,7 @@ ${argumentNode.description}
                 `Run ${definition.operation}`,
                 "apollographql.runQuery",
                 graphql.parse(
-                  [
-                    definition,
-                    ...fragmentSpreads
-                  ]
+                  [definition, ...fragmentSpreads]
                     .map(n => graphql.print(n))
                     .join("\n")
                 ),

diff --git a/packages/apollo-language-server/src/project.ts b/packages/apollo-language-server/src/project.ts
@@ -10,7 +10,6 @@ import {
   FragmentSpreadNode,
   TypeInfo,
   visitWithTypeInfo,
-  GraphQLCompositeType,
   printSchema,
   buildSchema,
   Source
@@ -343,8 +342,7 @@ export class GraphQLProject {
             visitWithTypeInfo(typeInfo, {
               enter: node => {
                 if (node.kind == "Field" && typeInfo.getParentType()) {
-                  const parentName = (typeInfo.getParentType() as GraphQLCompositeType)
-                    .name;
+                  const parentName = typeInfo.getParentType()!.name;
                   const parentEngineStat = this.engineStats
                     .get(set.engineKey!)!
                     .get(parentName);

diff --git a/packages/apollo-language-server/src/typings/graphql-language-service.d.ts b/packages/apollo-language-server/src/typings/graphql-language-service.d.ts
@@ -1,4 +1,4 @@
-declare module "graphql-language-service-interface" {
+declare module "@apollographql/graphql-language-service-interface" {
   import { DocumentNode, GraphQLSchema, Location } from "graphql";
   import {
     Diagnostic,
@@ -14,9 +14,9 @@ declare module "graphql-language-service-interface" {
   ): CompletionItem[];
 }
 
-declare module "graphql-language-service-interface/dist/getAutocompleteSuggestions";
+declare module "@apollographql/graphql-language-service-interface/dist/getAutocompleteSuggestions";
 
-declare module "graphql-language-service-interface/dist/getDiagnostics" {
+declare module "@apollographql/graphql-language-service-interface/dist/getDiagnostics" {
   import { Location } from "graphql";
   import { Range } from "vscode-languageserver";