99designs · StevenACoffman · Apr 11, 2024 · Apr 10, 2024 · Apr 11, 2024
diff --git a/_examples/chat/generated.go b/_examples/chat/generated.go
diff --git a/_examples/config/generated.go b/_examples/config/generated.go
diff --git a/_examples/dataloader/generated.go b/_examples/dataloader/generated.go
diff --git a/_examples/embedding/subdir/entity.generated.go b/_examples/embedding/subdir/entity.generated.go
diff --git a/_examples/embedding/subdir/gendir/generated.go b/_examples/embedding/subdir/gendir/generated.go
diff --git a/_examples/embedding/subdir/prelude.generated.go b/_examples/embedding/subdir/prelude.generated.go
diff --git a/_examples/embedding/subdir/root.generated.go b/_examples/embedding/subdir/root.generated.go
diff --git a/_examples/enum/api/exec.go b/_examples/enum/api/exec.go
diff --git a/_examples/federation/accounts/graph/generated.go b/_examples/federation/accounts/graph/generated.go
diff --git a/_examples/federation/products/graph/generated.go b/_examples/federation/products/graph/generated.go
diff --git a/_examples/federation/reviews/graph/generated.go b/_examples/federation/reviews/graph/generated.go
diff --git a/_examples/fileupload/generated.go b/_examples/fileupload/generated.go
diff --git a/_examples/scalars/generated.go b/_examples/scalars/generated.go
diff --git a/_examples/selection/generated.go b/_examples/selection/generated.go
diff --git a/_examples/starwars/generated/exec.go b/_examples/starwars/generated/exec.go
diff --git a/_examples/todo/generated.go b/_examples/todo/generated.go
diff --git a/_examples/type-system-extension/generated.go b/_examples/type-system-extension/generated.go
diff --git a/codegen/field.gotpl b/codegen/field.gotpl
@@ -21,7 +21,7 @@ func (ec *executionContext) _{{$object.Name}}_{{$field.Name}}(ctx context.Contex
 			res := &{{ $field.TypeReference.Elem.GO | ref }}{}
 		{{- else }}
 			res := {{ $field.TypeReference.GO | ref }}{}
-		{{- end }} 
+		{{- end }}
 		fc.Result = res
 		return ec.{{ $field.TypeReference.MarshalFunc }}(ctx, field.Selections, res)
 	{{- else}}
@@ -72,7 +72,7 @@ func (ec *executionContext) _{{$object.Name}}_{{$field.Name}}(ctx context.Contex
 	{{- end }}
 }
 
-func (ec *executionContext) {{ $field.FieldContextFunc }}(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+func (ec *executionContext) {{ $field.FieldContextFunc }}({{ if not $field.Args }}_{{ else }}ctx{{ end }} context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
 	fc = &graphql.FieldContext{
 		Object: {{quote $field.Object.Name}},
 		Field: field,

diff --git a/codegen/testserver/followschema/builtinscalar.generated.go b/codegen/testserver/followschema/builtinscalar.generated.go
diff --git a/codegen/testserver/followschema/complexity.generated.go b/codegen/testserver/followschema/complexity.generated.go
diff --git a/codegen/testserver/followschema/defaults.generated.go b/codegen/testserver/followschema/defaults.generated.go
diff --git a/codegen/testserver/followschema/defer.generated.go b/codegen/testserver/followschema/defer.generated.go
diff --git a/codegen/testserver/followschema/directive.generated.go b/codegen/testserver/followschema/directive.generated.go
diff --git a/codegen/testserver/followschema/embedded.generated.go b/codegen/testserver/followschema/embedded.generated.go
diff --git a/codegen/testserver/followschema/fields_order.generated.go b/codegen/testserver/followschema/fields_order.generated.go