Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Picking some nits that my IDE complained about #91

Merged
merged 3 commits into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ csilvers is Craig Silverstein

## Running genqlient

It's already checked in to github, but to regenerate `generated.go`:
It's already checked in to GitHub, but to regenerate `generated.go`:
```sh
go generate ./...
```
Expand Down
2 changes: 1 addition & 1 deletion example/cmd/example/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
example "github.com/Khan/genqlient/example"
"github.com/Khan/genqlient/example"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions generate/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (g *generator) convertInputType(
options, queryOptions *genqlientDirective,
) (goType, error) {
// note prefix is ignored here (see generator.typeName), as is selectionSet
// (for input types we use the whole thing)).
// (for input types we use the whole thing).
return g.convertType(nil, typ, nil, options, queryOptions)
}

Expand Down Expand Up @@ -463,7 +463,7 @@ func (g *generator) convertInlineFragment(
containingTypedef *ast.Definition,
queryOptions *genqlientDirective,
) ([]*goStructField, error) {
// You might think fragmentTypedef would be fragment.ObjectDefinition, but
// You might think fragmentTypedef would be a fragment.ObjectDefinition, but
// actually that's the type into which the fragment is spread.
fragmentTypedef := g.schema.Types[fragment.TypeCondition]
if !fragmentMatches(containingTypedef, fragmentTypedef) {
Expand Down
2 changes: 1 addition & 1 deletion generate/description.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type descriptionInfo struct {
CommentOverride string
// name of the corresponding GraphQL type
GraphQLName string
// GraphQL description of the type .GraphQLName, if any
// GraphQL schema's description of the type .GraphQLName, if any
GraphQLDescription string
// name of the corresponding GraphQL fragment (on .GraphQLName), if any
FragmentName string
Expand Down
2 changes: 1 addition & 1 deletion generate/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (typ *goInterfaceType) WriteDefinition(w io.Writer, g *generator) error {
"Get%s is a part of, and documented with, the interface %s.",
sharedField.GoName, typ.GoName)
writeDescription(w, description)
// In principle we should find the corresponding field of the
// In principle, we should find the corresponding field of the
// implementation and use its name in `v.<name>`. In practice,
// they're always the same.
fmt.Fprintf(w, "func (v *%s) Get%s() %s { return v.%s }\n",
Expand Down
2 changes: 1 addition & 1 deletion graphql/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/vektah/gqlparser/v2/gqlerror"
)

// Client is the interface that the generate code calls into to actually make
// Client is the interface that the generated code calls into to actually make
// requests.
//
// Unstable: This interface is likely to change before v1.0, see #19.
Expand Down
2 changes: 1 addition & 1 deletion graphql/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package graphql
// NoUnmarshalJSON is intended for the use of genqlient's generated code only.
//
// It is used to prevent a struct type from inheriting its embed's
// UnmarshalJSON method: given a type
// UnmarshalJSON method, so if we construct a type:
// type T struct { E; NoUnmarshalJSON }
// where E has an UnmarshalJSON method, T will not inherit it, per the Go
// selector rules: https://golang.org/ref/spec#Selectors.
Expand Down
2 changes: 1 addition & 1 deletion internal/integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func TestInterfaceListPointerField(t *testing.T) {
assert.Equal(t, "Yours Truly", (*resp.Beings[0]).GetName())

user, ok := (*resp.Beings[0]).(*queryWithInterfaceListPointerFieldBeingsUser)
require.Truef(t, ok, "got %T, not User", (*resp.Beings[0]))
require.Truef(t, ok, "got %T, not User", *resp.Beings[0])
assert.Equal(t, "1", user.Id)
assert.Equal(t, "Yours Truly", user.Name)

Expand Down