Add extra padding in subcommand section (#170)

* Tweak lint/format rules

* Add extra padding in subcommand section

Author: FollowTheProcess

.golangci.yml

@@ -4,11 +4,17 @@ formatters:
   enable:
     - gofumpt
     - goimports
+    - golines
 
   settings:
     gofumpt:
       extra-rules: true
 
+    golines:
+      max-len: 140
+      shorten-comments: true
+      reformat-tags: true
+
 linters:
   default: all
   disable:

Taskfile.yml

@@ -25,14 +25,15 @@ tasks:
     desc: Run go fmt on all source files
     sources:
       - "**/*.go"
+      - .golangci.yml
     cmds:
-      - go fmt ./...
+      - golangci-lint fmt ./...
 
   test:
     desc: Run the test suite
     sources:
       - "**/*.go"
-      - testdata/**/*.txt
+      - "**/testdata/**/*"
       - go.mod
       - go.sum
     cmds:

command.go

@@ -674,7 +674,7 @@ func writeSubcommands(cmd *Command, s *strings.Builder) error {
 
 	s.WriteString(colour.Title("Commands"))
 	s.WriteByte(':')
-	s.WriteByte('\n')
+	s.WriteString("\n\n")
 
 	tab := table.New(s)
 	for _, subcommand := range cmd.subcommands {

internal/flag/set_test.go

@@ -948,6 +948,7 @@ func TestFlagSet(t *testing.T) {
 
 				err = flag.AddToSet(set, f)
 				test.Err(t, err)
+
 				if err != nil {
 					test.Equal(t, err.Error(), "cannot add flag to a nil set")
 				}
@@ -961,6 +962,7 @@ func TestFlagSet(t *testing.T) {
 			test: func(t *testing.T, set *flag.Set) {
 				err := set.Parse([]string{"args", "here", "doesn't", "matter"})
 				test.Err(t, err)
+
 				if err != nil {
 					test.Equal(t, err.Error(), "Parse called on a nil set")
 				}
@@ -990,6 +992,7 @@ func TestFlagSet(t *testing.T) {
 				// Add the same flag again
 				err = flag.AddToSet(set, f)
 				test.Err(t, err)
+
 				if err != nil {
 					test.Equal(t, err.Error(), `flag "count" already defined`)
 				}
@@ -1013,6 +1016,7 @@ func TestFlagSet(t *testing.T) {
 				// Add the different flag with the same na,e
 				err = flag.AddToSet(set, f2)
 				test.Err(t, err)
+
 				if err != nil {
 					test.Equal(t, err.Error(), `flag "count" already defined`)
 				}
@@ -1036,6 +1040,7 @@ func TestFlagSet(t *testing.T) {
 				// Add the different flag with the same na,e
 				err = flag.AddToSet(set, f2)
 				test.Err(t, err)
+
 				if err != nil {
 					test.Equal(t, err.Error(), `shorthand "c" already in use for flag "count"`)
 				}

internal/table/table.go

@@ -30,6 +30,8 @@ func New(w io.Writer) Table {
 }
 
 // Row adds a row to the [Table].
+//
+//nolint:goprintffuncname // I like it this way
 func (t Table) Row(format string, a ...any) {
 	fmt.Fprintf(t.tw, format, a...)
 }

testdata/snapshots/TestHelp/subcommands_different_lengths.snap.txt

@@ -5,6 +5,7 @@ A longer, probably multiline description
 Usage: test [OPTIONS] COMMAND
 
 Commands:
+
   sub1                  Do one thing
   sub2                  Do another thing
   very-long-subcommand  Wow so long

testdata/snapshots/TestHelp/with_subcommands.snap.txt

@@ -5,6 +5,7 @@ A longer, probably multiline description
 Usage: test [OPTIONS] COMMAND
 
 Commands:
+
   sub1  Do one thing
   sub2  Do another thing
 

testdata/snapshots/TestHelp/with_subcommands_and_flags.snap.txt

@@ -5,6 +5,7 @@ A longer, probably multiline description
 Usage: test [OPTIONS] COMMAND
 
 Commands:
+
   sub1  Do one thing
   sub2  Do another thing