Fix missing descriptions and add more hover information for arguments (#515)

Author: shadaj

packages/apollo-language-server/src/languageProvider.ts

@@ -197,27 +197,31 @@ export class GraphQLLanguageProvider {
           }
           break;
         }
+
         case Kind.FIELD: {
           const parentType = typeInfo.getParentType();
           const fieldDef = typeInfo.getFieldDef();
 
           if (parentType && fieldDef) {
+            const argsString = fieldDef.args.length > 0 ?
+              `(${fieldDef.args.map(a => `${a.name}: ${a.type}`).join(", ")})` : "";
             return {
               contents: `
 \`\`\`graphql
-${parentType}.${fieldDef.name}: ${fieldDef.type}
+${parentType}.${fieldDef.name}${argsString}: ${fieldDef.type}
 \`\`\`
 ${fieldDef.description}
 `,
               range: rangeForASTNode(highlightNodeForNode(node))
             };
           }
+
           break;
         }
-        case Kind.NAMED_TYPE: {
-          const type = typeInfo.getType() as GraphQLNamedType | void;
 
-          if (!(type && type.astNode && type.astNode.loc)) break;
+        case Kind.NAMED_TYPE: {
+          const type = set.schema.getType(node.name.value) as GraphQLNamedType | void;
+          if (!type) break;
 
           return {
             contents: `
@@ -229,6 +233,19 @@ ${type.description}
             range: rangeForASTNode(highlightNodeForNode(node))
           };
         }
+
+        case Kind.ARGUMENT: {
+          const argumentNode = typeInfo.getArgument()!;
+          return {
+            contents: `
+\`\`\`graphql
+${argumentNode.name}: ${argumentNode.type}
+\`\`\`
+${argumentNode.description}
+`,
+            range: rangeForASTNode(highlightNodeForNode(node))
+          }
+        }
       }
     }
     return null;

packages/apollo-language-server/src/project.ts

@@ -222,9 +222,7 @@ export class GraphQLProject {
 
     for (const set of this.documentSets) {
       if (!set.schema!.getQueryType()!.astNode) {
-        const schemaSource = printSchema(set.schema!, {
-          commentDescriptions: true
-        });
+        const schemaSource = printSchema(set.schema!);
 
         set.schema = buildSchema(
           new Source(

packages/apollo-vscode/syntaxes/graphql.json

@@ -171,13 +171,25 @@
       ]
     },
     "graphql-comment": {
-      "comment":
-        "need to prefix comment space with a scope else Atom's reflow cmd doesn't work",
-      "name": "comment.line.graphql.js",
-      "match": "(\\s*)(#).*",
-      "captures": {
-        "1": { "name": "punctuation.whitespace.comment.leading.graphql" }
-      }
+      "patterns": [
+        {
+          "comment":
+            "need to prefix comment space with a scope else Atom's reflow cmd doesn't work",
+          "name": "comment.line.graphql.js",
+          "match": "(\\s*)(#).*",
+          "captures": {
+            "1": { "name": "punctuation.whitespace.comment.leading.graphql" }
+          }
+        },
+        {
+          "name": "comment.line.graphql.js",
+          "begin": "(\"\"\")",
+          "end": "(\"\"\")",
+          "beginCaptures": {
+            "1": { "name": "punctuation.whitespace.comment.leading.graphql" }
+          }
+        }
+      ]
     },
     "graphql-variable-definitions": {
       "begin": "\\s*(\\()",