parser: Inline 'parseExecutableDefinition' to simplify code (#2069)

graphql · Aug 1, 2019 · d130a60 · d130a60
1 parent b13f283
commit d130a60
Showing 1 changed file with 7 additions and 26 deletions.
diff --git a/src/language/parser.js b/src/language/parser.js
@@ -19,7 +19,6 @@ import {
   type VariableNode,
   type DocumentNode,
   type DefinitionNode,
-  type ExecutableDefinitionNode,
   type OperationDefinitionNode,
   type OperationTypeNode,
   type VariableDefinitionNode,
@@ -217,15 +216,20 @@ class Parser {
    *   - ExecutableDefinition
    *   - TypeSystemDefinition
    *   - TypeSystemExtension
+   *
+   * ExecutableDefinition :
+   *   - OperationDefinition
+   *   - FragmentDefinition
    */
   parseDefinition(): DefinitionNode {
     if (this.peek(TokenKind.NAME)) {
       switch (this._lexer.token.value) {
         case 'query':
         case 'mutation':
         case 'subscription':
+          return this.parseOperationDefinition();
         case 'fragment':
-          return this.parseExecutableDefinition();
+          return this.parseFragmentDefinition();
         case 'schema':
         case 'scalar':
         case 'type':
@@ -239,37 +243,14 @@ class Parser {
           return this.parseTypeSystemExtension();
       }
     } else if (this.peek(TokenKind.BRACE_L)) {
-      return this.parseExecutableDefinition();
+      return this.parseOperationDefinition();
     } else if (this.peekDescription()) {
       return this.parseTypeSystemDefinition();
     }
 
     throw this.unexpected();
   }
 
-  /**
-   * ExecutableDefinition :
-   *   - OperationDefinition
-   *   - FragmentDefinition
-   */
-  parseExecutableDefinition(): ExecutableDefinitionNode {
-    if (this.peek(TokenKind.NAME)) {
-      switch (this._lexer.token.value) {
-        case 'query':
-        case 'mutation':
-        case 'subscription':
-          return this.parseOperationDefinition();
-
-        case 'fragment':
-          return this.parseFragmentDefinition();
-      }
-    } else if (this.peek(TokenKind.BRACE_L)) {
-      return this.parseOperationDefinition();
-    }
-
-    throw this.unexpected();
-  }
-
   // Implements the parsing rules in the Operations section.
 
   /**