Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 keepsorted/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func validate(opts *blockOptions) (warnings []error) {
}

if opts.NewlineSeparated < 0 {
warns = append(warns, fmt.Errorf("newline_separated has invalid value: %v", opts.SkipLines))
warns = append(warns, fmt.Errorf("newline_separated has invalid value: %v", opts.NewlineSeparated))
opts.NewlineSeparated = 0
}

Expand Down
11 changes: 6 additions & 5 deletions keepsorted/options_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,22 +225,23 @@ func TestPopValue(t *testing.T) {
want: []*regexp.Regexp{regexp.MustCompile(".*"), regexp.MustCompile("abcd"), regexp.MustCompile("(?:efgh)ijkl")},
},
{
name: "Newlines",
name: "IntOrBool_Int",

input: "5",
want: IntOrBool(5),
},
{
name: "Newlines_BoolTrue",
name: "IntOrBool_True",
input: "yes",
want: IntOrBool(1),
},
{
name: "Newlines_BoolFalse",
name: "IntOrBool_False",
input: "no",
want: IntOrBool(0),
}, {
name: "Newlines_Invalid",
},
{
name: "IntOrBool_Invalid",

input: "foo",
want: IntOrBool(0),
Expand Down
12 changes: 12 additions & 0 deletions keepsorted/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ func TestBlockOptions(t *testing.T) {

want: blockOptions{NewlineSeparated: 1},
},
{
name: "NewlineSeparated_Int",
in: "newline_separated=10",

want: blockOptions{NewlineSeparated: 10},
},
{
name: "NewlineSeparated_Invalid",
in: "newline_separated=-1",

wantErr: "newline_separated has invalid value: -1",
},
{
name: "ErrorSkipLinesIsNegative",
in: "skip_lines=-1",
Expand Down
Loading