Separate out conditionals in collect fields

These conditions are not really related, and I missed the second conditional when reading through the first time.
cgxxv · Feb 7, 2019 · 76caf71 · 76caf71
1 parent f7fb72e
commit 76caf71
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/graphql/exec.go b/graphql/exec.go
@@ -35,7 +35,10 @@ func collectFields(reqCtx *RequestContext, selSet ast.SelectionSet, satisfies []
 
 			f.Selections = append(f.Selections, sel.SelectionSet...)
 		case *ast.InlineFragment:
-			if !shouldIncludeNode(sel.Directives, reqCtx.Variables) || !instanceOf(sel.TypeCondition, satisfies) {
+			if !shouldIncludeNode(sel.Directives, reqCtx.Variables) {
+				continue
+			}
+			if !instanceOf(sel.TypeCondition, satisfies) {
 				continue
 			}
 			for _, childField := range collectFields(reqCtx, sel.SelectionSet, satisfies, visited) {