make TypeCondition optional in InlineFragments

graphql · Feb 2, 2016 · 5b8ba38 · 5b8ba38
1 parent 06f48a2
commit 5b8ba38
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/__tests__/mode-test.js b/src/__tests__/mode-test.js
@@ -36,6 +36,20 @@ describe('graphql-mode', () => {
     ]);
   });
 
+  it('parses inline fragments with optional syntax correctly', () => {
+    CodeMirror.runMode('{ ... on OptionalType { name } }', 'graphql',
+      (token, style) => expect(style).to.not.equal('invalidchar')
+    );
+
+    CodeMirror.runMode('{ ... { name } }', 'graphql',
+      (token, style) => expect(style).to.not.equal('invalidchar')
+    );
+
+    CodeMirror.runMode('{ ... @optionalDirective { name } }', 'graphql',
+      (token, style) => expect(style).to.not.equal('invalidchar')
+    );
+  });
+
   it('returns "invalidchar" message when there is no matching token', () => {
     CodeMirror.runMode('qauery name', 'graphql', (token, style) => {
       if (token.trim()) {

diff --git a/src/mode.js b/src/mode.js
@@ -359,8 +359,8 @@ var ParseRules = {
   SelectionSet: [ p('{'), list('Selection'), p('}') ],
   Selection(token, stream) {
     return token.value === '...' ?
-      stream.match(/[\s\u00a0,]*on\b/, false) ?
-        'InlineFragment' : 'FragmentSpread' :
+      stream.match(/[\s\u00a0,]*(?!on\b)[_A-Za-z]/, false) ?
+        'FragmentSpread' : 'InlineFragment' :
       stream.match(/[\s\u00a0,]*:/, false) ? 'AliasedField' : 'Field';
   },
   // Note: this minor deviation of "AliasedField" simplifies the lookahead.