fix: bug with externalFragments in codemirror (#1751)

graphql · Jan 7, 2021 · f423e61 · f423e61
1 parent 464a885
commit f423e61
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/packages/codemirror-graphql/src/hint.js b/packages/codemirror-graphql/src/hint.js
@@ -13,7 +13,6 @@
 import CodeMirror from 'codemirror';
 import { getAutocompleteSuggestions } from 'graphql-language-service-interface';
 import { Position } from 'graphql-language-service-utils';
-import { getFragmentDefinitions } from './utils/getFragmentDefinitions';
 /**
  * Registers a "hint" helper for CodeMirror.
  *
@@ -52,9 +51,7 @@ CodeMirror.registerHelper('hint', 'graphql', (editor, options) => {
     editor.getValue(),
     position,
     token,
-    Array.isArray(options.externalFragments)
-      ? options.externalFragments
-      : getFragmentDefinitions(options.externalFragments),
+    options.externalFragments,
   );
 
   const results = {

diff --git a/packages/codemirror-graphql/src/lint.js b/packages/codemirror-graphql/src/lint.js
@@ -33,7 +33,12 @@ const TYPE = {
  */
 CodeMirror.registerHelper('lint', 'graphql', (text, options) => {
   const schema = options.schema;
-  const rawResults = getDiagnostics(text, schema, options.validationRules);
+  const rawResults = getDiagnostics(
+    text,
+    schema,
+    options.validationRules,
+    options.externalFragments,
+  );
 
   const results = rawResults.map(error => ({
     message: error.message,

diff --git a/packages/codemirror-graphql/src/utils/getFragmentDefinitions.js b/packages/codemirror-graphql/src/utils/getFragmentDefinitions.js
diff --git a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts
@@ -44,6 +44,8 @@ import {
   isAbstractType,
   isCompositeType,
   isInputType,
+  visit,
+  parse,
 } from 'graphql';
 
 import {
@@ -63,6 +65,24 @@ import {
   hintList,
   objectValues,
 } from './autocompleteUtils';
+
+const collectFragmentDefs = (op: string | undefined) => {
+  const externalFragments: FragmentDefinitionNode[] = [];
+  if (op) {
+    visit(
+      parse(op, {
+        experimentalFragmentVariables: true,
+      }),
+      {
+        FragmentDefinition(def) {
+          externalFragments.push(def);
+        },
+      },
+    );
+  }
+  return externalFragments;
+};
+
 /**
  * Given GraphQLSchema, queryText, and context of the current position within
  * the source text, provide a list of typeahead entries.
@@ -72,7 +92,7 @@ export function getAutocompleteSuggestions(
   queryText: string,
   cursor: IPosition,
   contextToken?: ContextToken,
-  fragmentDefs?: FragmentDefinitionNode[],
+  fragmentDefs?: FragmentDefinitionNode[] | string,
 ): Array<CompletionItem> {
   const token = contextToken || getTokenAtPosition(queryText, cursor);
 
@@ -207,7 +227,9 @@ export function getAutocompleteSuggestions(
       typeInfo,
       schema,
       queryText,
-      fragmentDefs,
+      Array.isArray(fragmentDefs)
+        ? fragmentDefs
+        : collectFragmentDefs(fragmentDefs),
     );
   }
 
@@ -489,6 +511,9 @@ function getSuggestionsForFragmentSpread(
   queryText: string,
   fragmentDefs?: FragmentDefinitionNode[],
 ): Array<CompletionItem> {
+  if (!queryText) {
+    return [];
+  }
   const typeMap = schema.getTypeMap();
   const defState = getDefinitionState(token.state);
   const fragments = getFragmentDefinitions(queryText);